From a89b8f666cd30903f275679924397d1450ef722e Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 25 May 2016 17:30:22 -0400 Subject: [PATCH] <200 errors. All I have left is a bit of rendering work and the new "off hand" stuff --- .../mekanism/client/ClientTickHandler.java | 23 +++--- .../mekanism/client/MekanismKeyHandler.java | 7 +- .../mekanism/client/SparkleAnimation.java | 4 +- .../mekanism/client/gui/GuiDictionary.java | 5 +- .../mekanism/client/gui/GuiDigitalMiner.java | 9 ++- .../client/gui/GuiDigitalMinerConfig.java | 23 +++--- .../client/gui/GuiElectrolyticSeparator.java | 5 +- .../java/mekanism/client/gui/GuiFactory.java | 3 +- .../client/gui/GuiFormulaicAssemblicator.java | 11 +-- .../java/mekanism/client/gui/GuiGasTank.java | 3 +- .../client/gui/GuiLogisticalSorter.java | 20 ++--- .../mekanism/client/gui/GuiMFilterSelect.java | 3 +- .../client/gui/GuiMItemStackFilter.java | 11 +-- .../client/gui/GuiMMaterialFilter.java | 9 ++- .../mekanism/client/gui/GuiMModIDFilter.java | 9 ++- .../client/gui/GuiMOreDictFilter.java | 9 ++- .../client/gui/GuiMetallurgicInfuser.java | 3 +- .../client/gui/GuiOredictionificator.java | 3 +- .../gui/GuiOredictionificatorFilter.java | 9 ++- .../client/gui/GuiQuantumEntangloporter.java | 3 +- .../client/gui/GuiResistiveHeater.java | 3 +- .../mekanism/client/gui/GuiRobitCrafting.java | 11 +-- .../client/gui/GuiRobitInventory.java | 11 +-- .../mekanism/client/gui/GuiRobitMain.java | 19 ++--- .../mekanism/client/gui/GuiRobitRepair.java | 11 +-- .../mekanism/client/gui/GuiRobitSmelting.java | 11 +-- .../client/gui/GuiRotaryCondensentrator.java | 3 +- .../mekanism/client/gui/GuiSecurityDesk.java | 3 +- .../client/gui/GuiSideConfiguration.java | 7 +- .../mekanism/client/gui/GuiTFilterSelect.java | 3 +- .../client/gui/GuiTItemStackFilter.java | 10 ++- .../client/gui/GuiTMaterialFilter.java | 8 +- .../mekanism/client/gui/GuiTModIDFilter.java | 8 +- .../client/gui/GuiTOreDictFilter.java | 8 +- .../mekanism/client/gui/GuiTeleporter.java | 3 +- .../client/gui/GuiTransporterConfig.java | 9 ++- .../client/gui/GuiUpgradeManagement.java | 5 +- .../client/gui/element/GuiBoilerTab.java | 3 +- .../client/gui/element/GuiConfigTypeTab.java | 3 +- .../gui/element/GuiContainerEditMode.java | 3 +- .../client/gui/element/GuiDetectionTab.java | 3 +- .../client/gui/element/GuiMatrixTab.java | 3 +- .../gui/element/GuiRedstoneControl.java | 3 +- .../client/gui/element/GuiSecurityTab.java | 3 +- .../gui/element/GuiSideConfigurationTab.java | 3 +- .../client/gui/element/GuiSortingTab.java | 3 +- .../gui/element/GuiTransporterConfigTab.java | 3 +- .../client/gui/element/GuiUpgradeTab.java | 3 +- .../client/gui/element/GuiVisualsTab.java | 3 +- .../client/render/ctm/CTMModelFactory.java | 73 +++++++++++++------ .../client/render/ctm/CTMRegistry.java | 6 +- .../java/mekanism/client/render/ctm/Quad.java | 7 +- .../client/render/entity/RenderFlame.java | 3 +- .../render/item/BakedCustomItemModel.java | 15 ++-- .../render/item/CustomItemModelFactory.java | 36 ++++++--- .../client/render/tileentity/RenderBin.java | 2 +- .../render/tileentity/RenderDynamicTank.java | 4 +- .../render/tileentity/RenderFluidTank.java | 4 +- .../RenderThermalEvaporationController.java | 2 +- .../RenderThermoelectricBoiler.java | 6 +- .../transmitter/RenderMechanicalPipe.java | 7 +- .../transmitter/RenderPressurizedTube.java | 5 +- .../transmitter/RenderUniversalCable.java | 5 +- .../sound/{Sound.java => MekSound.java} | 32 ++++---- .../mekanism/client/sound/PlayerSound.java | 2 +- .../mekanism/client/sound/SoundHandler.java | 6 +- .../java/mekanism/client/sound/TileSound.java | 2 +- .../java/mekanism/common/MekanismBlocks.java | 58 +++++++++------ .../java/mekanism/common/MekanismSounds.java | 25 +++++++ .../java/mekanism/common/RobitAIFollow.java | 30 ++++++-- .../java/mekanism/common/RobitAIPickup.java | 30 ++++++-- .../mekanism/common/block/BlockBasic.java | 4 +- .../mekanism/common/block/BlockGasTank.java | 10 +-- .../common/block/BlockObsidianTNT.java | 3 +- .../common/content/transporter/Finder.java | 2 +- .../content/transporter/TMaterialFilter.java | 2 +- .../common/entity/EntityBabySkeleton.java | 13 +++- .../mekanism/common/entity/EntityBalloon.java | 64 ++++++++-------- .../mekanism/common/entity/EntityFlame.java | 5 +- .../mekanism/common/entity/EntityRobit.java | 53 +++++++------- .../common/frequency/FrequencyManager.java | 10 ++- .../common/item/ItemAtomicDisassembler.java | 3 +- .../common/item/ItemBlockMachine.java | 9 ++- .../common/item/ItemBlockPlastic.java | 3 +- .../common/multiblock/MultiblockManager.java | 2 +- .../common/multiblock/UpdateProtocol.java | 2 +- .../common/network/PacketDigitalMinerGui.java | 2 +- .../network/PacketFlamethrowerData.java | 2 +- .../common/network/PacketJetpackData.java | 5 +- .../network/PacketLogisticalSorterGui.java | 2 +- .../network/PacketOredictionificatorGui.java | 2 +- .../common/network/PacketScubaTankData.java | 5 +- .../common/network/PacketSimpleGui.java | 2 +- .../TileEntityAdvancedElectricMachine.java | 4 +- .../common/tile/TileEntityBasicMachine.java | 4 +- .../mekanism/common/tile/TileEntityBin.java | 8 +- .../common/tile/TileEntityChargepad.java | 4 +- .../tile/TileEntityChemicalCrystallizer.java | 4 +- .../TileEntityChemicalDissolutionChamber.java | 4 +- .../tile/TileEntityChemicalInfuser.java | 4 +- .../tile/TileEntityChemicalOxidizer.java | 4 +- .../common/tile/TileEntityChemicalWasher.java | 4 +- .../common/tile/TileEntityContainerBlock.java | 4 +- .../common/tile/TileEntityDigitalMiner.java | 4 +- .../common/tile/TileEntityElectricBlock.java | 4 +- .../common/tile/TileEntityElectricPump.java | 4 +- .../tile/TileEntityElectrolyticSeparator.java | 4 +- .../common/tile/TileEntityEnergyCube.java | 4 +- .../common/tile/TileEntityFactory.java | 4 +- .../common/tile/TileEntityFluidTank.java | 4 +- .../tile/TileEntityFluidicPlenisher.java | 4 +- .../TileEntityFormulaicAssemblicator.java | 4 +- .../common/tile/TileEntityFuelwoodHeater.java | 4 +- .../common/tile/TileEntityGasTank.java | 4 +- .../common/tile/TileEntityInductionCell.java | 4 +- .../common/tile/TileEntityInductionPort.java | 4 +- .../tile/TileEntityInductionProvider.java | 4 +- .../mekanism/common/tile/TileEntityLaser.java | 4 +- .../common/tile/TileEntityLaserAmplifier.java | 4 +- .../tile/TileEntityLogisticalSorter.java | 4 +- .../tile/TileEntityMetallurgicInfuser.java | 4 +- .../common/tile/TileEntityMultiblock.java | 4 +- .../tile/TileEntityOredictionificator.java | 4 +- .../mekanism/common/tile/TileEntityPRC.java | 4 +- .../tile/TileEntityQuantumEntangloporter.java | 4 +- .../tile/TileEntityResistiveHeater.java | 4 +- .../tile/TileEntityRotaryCondensentrator.java | 4 +- .../common/tile/TileEntitySecurityDesk.java | 4 +- .../tile/TileEntitySeismicVibrator.java | 4 +- .../tile/TileEntitySolarNeutronActivator.java | 4 +- .../common/tile/TileEntityTeleporter.java | 4 +- ...ileEntityThermalEvaporationController.java | 4 +- .../generators/client/gui/GuiReactorFuel.java | 3 +- .../generators/client/gui/GuiReactorHeat.java | 3 +- .../client/gui/GuiReactorLogicAdapter.java | 5 +- .../client/gui/GuiReactorStats.java | 3 +- .../client/gui/element/GuiFuelTab.java | 3 +- .../client/gui/element/GuiHeatTab.java | 3 +- .../client/gui/element/GuiStatTab.java | 3 +- .../client/gui/element/GuiTurbineTab.java | 3 +- .../client/render/RenderBioGenerator.java | 2 +- .../render/RenderIndustrialTurbine.java | 2 +- .../render/item/BakedGeneratorItemModel.java | 15 ++-- .../item/GeneratorItemModelFactory.java | 36 ++++++--- .../generators/common/GeneratorsItems.java | 11 +-- .../common/block/BlockGenerator.java | 11 ++- .../common/tile/TileEntityBioGenerator.java | 4 +- .../common/tile/TileEntityGasGenerator.java | 4 +- .../common/tile/TileEntityGenerator.java | 4 +- .../common/tile/TileEntityHeatGenerator.java | 4 +- .../reactor/TileEntityReactorController.java | 4 +- .../TileEntityReactorLogicAdapter.java | 4 +- 152 files changed, 754 insertions(+), 439 deletions(-) rename src/main/java/mekanism/client/sound/{Sound.java => MekSound.java} (66%) create mode 100644 src/main/java/mekanism/common/MekanismSounds.java diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 8951fe084..a139526f2 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -38,6 +38,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.network.NetworkPlayerInfo; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; @@ -199,8 +200,10 @@ public class ClientTickHandler } } } + + ItemStack bootStack = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.FEET); - if(mc.thePlayer.getEquipmentInSlot(1) != null && mc.thePlayer.getEquipmentInSlot(1).getItem() instanceof ItemFreeRunners) + if(bootStack != null && bootStack.getItem() instanceof ItemFreeRunners) { mc.thePlayer.stepHeight = 1.002F; } @@ -296,7 +299,9 @@ public class ClientTickHandler } } - if(mc.thePlayer.getEquipmentInSlot(3) != null && mc.thePlayer.getEquipmentInSlot(3).getItem() instanceof ItemJetpack) + ItemStack chestStack = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + + if(chestStack != null && chestStack.getItem() instanceof ItemJetpack) { MekanismClient.updateKey(mc.gameSettings.keyBindJump, KeySync.ASCEND); MekanismClient.updateKey(mc.gameSettings.keyBindSneak, KeySync.DESCEND); @@ -314,14 +319,14 @@ public class ClientTickHandler if(isJetpackOn(mc.thePlayer)) { - ItemJetpack jetpack = (ItemJetpack)mc.thePlayer.getEquipmentInSlot(3).getItem(); + ItemJetpack jetpack = (ItemJetpack)chestStack.getItem(); - if(jetpack.getMode(mc.thePlayer.getEquipmentInSlot(3)) == JetpackMode.NORMAL) + if(jetpack.getMode(chestStack) == JetpackMode.NORMAL) { mc.thePlayer.motionY = Math.min(mc.thePlayer.motionY + 0.15D, 0.5D); mc.thePlayer.fallDistance = 0.0F; } - else if(jetpack.getMode(mc.thePlayer.getEquipmentInSlot(3)) == JetpackMode.HOVER) + else if(jetpack.getMode(chestStack) == JetpackMode.HOVER) { if((!mc.gameSettings.keyBindJump.isKeyDown() && !mc.gameSettings.keyBindSneak.isKeyDown()) || (mc.gameSettings.keyBindJump.isKeyDown() && mc.gameSettings.keyBindSneak.isKeyDown()) || mc.currentScreen != null) { @@ -354,17 +359,17 @@ public class ClientTickHandler mc.thePlayer.fallDistance = 0.0F; } - jetpack.useGas(mc.thePlayer.getEquipmentInSlot(3)); + jetpack.useGas(chestStack); } if(isGasMaskOn(mc.thePlayer)) { - ItemScubaTank tank = (ItemScubaTank)mc.thePlayer.getEquipmentInSlot(3).getItem(); + ItemScubaTank tank = (ItemScubaTank)chestStack.getItem(); final int max = 300; - tank.useGas(mc.thePlayer.getEquipmentInSlot(3)); - GasStack received = tank.useGas(mc.thePlayer.getEquipmentInSlot(3), max-mc.thePlayer.getAir()); + tank.useGas(chestStack); + GasStack received = tank.useGas(chestStack, max-mc.thePlayer.getAir()); if(received != null) { diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index ca18edf9f..c473b169f 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -4,6 +4,7 @@ import mekanism.api.EnumColor; import mekanism.api.util.StackUtils; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.MekanismSounds; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemConfigurator; @@ -115,7 +116,7 @@ public class MekanismKeyHandler extends MekKeyHandler int newChan = wt.getChannel(toolStack) < 9 ? wt.getChannel(toolStack) + 1 : 1; wt.setChannel(toolStack, newChan); Mekanism.packetHandler.sendToServer(new WalkieTalkieStateMessage(newChan)); - SoundHandler.playSound("mekanism:etc.Ding"); + SoundHandler.playSound(MekanismSounds.DING); } } else if(player.isSneaking() && item instanceof ItemFlamethrower) @@ -146,7 +147,7 @@ public class MekanismKeyHandler extends MekKeyHandler } Mekanism.packetHandler.sendToServer(new JetpackDataMessage(JetpackPacket.MODE, null, player.isSneaking())); - SoundHandler.playSound("mekanism:etc.Hydraulic"); + SoundHandler.playSound(MekanismSounds.HYDRAULIC); } else if(chestItem instanceof ItemScubaTank) { @@ -154,7 +155,7 @@ public class MekanismKeyHandler extends MekKeyHandler scubaTank.toggleFlowing(chestStack); Mekanism.packetHandler.sendToServer(new ScubaTankDataMessage(ScubaTankPacket.MODE, null, false)); - SoundHandler.playSound("mekanism:etc.Hydraulic"); + SoundHandler.playSound(MekanismSounds.HYDRAULIC); } } } diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java index bab827f14..7a30d8930 100644 --- a/src/main/java/mekanism/client/SparkleAnimation.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -6,9 +6,11 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; +import mekanism.common.MekanismSounds; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -35,7 +37,7 @@ public class SparkleAnimation try { if(general.dynamicTankEasterEgg) { - pointer.getWorld().playSound(pointer.getPos().getX(), pointer.getPos().getY(), pointer.getPos().getZ(), "mekanism:etc.cj", 1F, 1F, false); + pointer.getWorld().playSound(null, pointer.getPos().getX(), pointer.getPos().getY(), pointer.getPos().getZ(), MekanismSounds.CJ_EASTER_EGG, SoundCategory.BLOCKS, 1F, 1F); } loop(pointer); diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index 1b633ccb4..fddd8f0f5 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -10,6 +10,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -122,7 +123,7 @@ public class GuiDictionary extends GuiMekanism itemType.stackSize = 1; scrollList.setText(MekanismUtils.getOreDictName(itemType)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); return; } @@ -147,7 +148,7 @@ public class GuiDictionary extends GuiMekanism scrollList.setText(null); } - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 0a1edd775..ffb2d77f4 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -32,6 +32,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -304,7 +305,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 147 && xAxis <= 161 && yAxis >= 47 && yAxis <= 61) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(0); @@ -314,7 +315,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 147 && xAxis <= 161 && yAxis >= 63 && yAxis <= 77) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(1); @@ -324,7 +325,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 131 && xAxis <= 145 && yAxis >= 47 && yAxis <= 61) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(5); @@ -334,7 +335,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 131 && xAxis <= 145 && yAxis >= 63 && yAxis <= 77) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(9); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 8c418be99..55791173a 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -31,6 +31,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -244,7 +245,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism data.add(getFilterIndex() + i); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); return; } @@ -260,7 +261,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism data.add(getFilterIndex() + i); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); return; } @@ -272,22 +273,22 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(filter instanceof MItemStackFilter) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 1, getFilterIndex()+i, 0)); } else if(filter instanceof MOreDictFilter) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 2, getFilterIndex()+i, 0)); } else if(filter instanceof MMaterialFilter) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 3, getFilterIndex()+i, 0)); } else if(filter instanceof MModIDFilter) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 6, getFilterIndex()+i, 0)); } } @@ -296,25 +297,25 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 4, 0, 0)); } if(xAxis >= 39 && xAxis <= 50 && yAxis >= 67 && yAxis <= 78) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); setRadius(); } if(xAxis >= 39 && xAxis <= 50 && yAxis >= 92 && yAxis <= 103) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); setMinY(); } if(xAxis >= 39 && xAxis <= 50 && yAxis >= 117 && yAxis <= 128) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); setMaxY(); } @@ -324,7 +325,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism data.add(10); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index 3af5ff8a0..acab2f321 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -34,6 +34,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -114,7 +115,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism data.add((byte)0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } else if(xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { @@ -122,7 +123,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism data.add((byte)1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 9cdb23c9a..0c7ac8c49 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -28,6 +28,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -175,7 +176,7 @@ public class GuiFactory extends GuiMekanism data.add(1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 5cc36acb5..42d21e607 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -29,6 +29,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -241,7 +242,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(4); @@ -255,7 +256,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(1); @@ -266,7 +267,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(2); @@ -276,7 +277,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(3); @@ -290,7 +291,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(0); diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 4cde3fa82..fb464d793 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -20,6 +20,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -97,7 +98,7 @@ public class GuiGasTank extends GuiMekanism data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 97d7f5246..6c6d54f8f 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -15,6 +15,7 @@ import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.MekanismSounds; import mekanism.common.OreDictCache; import mekanism.common.content.transporter.TItemStackFilter; import mekanism.common.content.transporter.TMaterialFilter; @@ -32,6 +33,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -263,7 +265,7 @@ public class GuiLogisticalSorter extends GuiMekanism data.add(getFilterIndex() + i); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); return; } @@ -279,7 +281,7 @@ public class GuiLogisticalSorter extends GuiMekanism data.add(getFilterIndex() + i); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); return; } @@ -289,22 +291,22 @@ public class GuiLogisticalSorter extends GuiMekanism if(filter instanceof TItemStackFilter) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 1, getFilterIndex() + i, 0)); } else if(filter instanceof TOreDictFilter) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 2, getFilterIndex() + i, 0)); } else if(filter instanceof TMaterialFilter) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 3, getFilterIndex() + i, 0)); } else if(filter instanceof TModIDFilter) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 5, getFilterIndex() + i, 0)); } } @@ -318,7 +320,7 @@ public class GuiLogisticalSorter extends GuiMekanism data.add(1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } // Check for round robin button @@ -328,7 +330,7 @@ public class GuiLogisticalSorter extends GuiMekanism data.add(2); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } @@ -345,7 +347,7 @@ public class GuiLogisticalSorter extends GuiMekanism data.add(mouseBtn); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("mekanism:etc.Ding"); + SoundHandler.playSound(MekanismSounds.DING); } } diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index 968f7dc49..3eb3840da 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -14,6 +14,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -115,7 +116,7 @@ public class GuiMFilterSelect extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } } diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 962f20cd9..7d87b7bbd 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -21,6 +21,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -255,19 +256,19 @@ public class GuiMItemStackFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0, 0, 0)); } if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); filter.requireStack = !filter.requireStack; } if(xAxis >= 15 && xAxis <= 29 && yAxis >= 45 && yAxis <= 59) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); filter.fuzzy = !filter.fuzzy; } @@ -291,7 +292,7 @@ public class GuiMItemStackFilter extends GuiMekanism filter.itemType = null; } - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } if(xAxis >= 149 && xAxis <= 165 && yAxis >= 19 && yAxis <= 35) @@ -321,7 +322,7 @@ public class GuiMItemStackFilter extends GuiMekanism filter.replaceStack = toUse; } - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index c2956a45b..a199d1efc 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -21,6 +21,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -243,13 +244,13 @@ public class GuiMMaterialFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0, 0, 0)); } if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); filter.requireStack = !filter.requireStack; } @@ -273,7 +274,7 @@ public class GuiMMaterialFilter extends GuiMekanism filter.materialItem = null; } - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } if(xAxis >= 149 && xAxis <= 165 && yAxis >= 19 && yAxis <= 35) @@ -303,7 +304,7 @@ public class GuiMMaterialFilter extends GuiMekanism filter.replaceStack = toUse; } - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 9765d11d4..7f3c952d5 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -25,6 +25,7 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -306,19 +307,19 @@ public class GuiMModIDFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0, 0, 0)); } if(xAxis >= 131 && xAxis <= 143 && yAxis >= 47 && yAxis <= 59) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); setModID(); } if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); filter.requireStack = !filter.requireStack; } @@ -349,7 +350,7 @@ public class GuiMModIDFilter extends GuiMekanism filter.replaceStack = toUse; } - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index e2ef6714e..abc0bee22 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -25,6 +25,7 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -306,19 +307,19 @@ public class GuiMOreDictFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0, 0, 0)); } if(xAxis >= 131 && xAxis <= 143 && yAxis >= 47 && yAxis <= 59) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); setOreDictKey(); } if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); filter.requireStack = !filter.requireStack; } @@ -349,7 +350,7 @@ public class GuiMOreDictFilter extends GuiMekanism filter.replaceStack = toUse; } - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 53d1ab63a..79cae810c 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -30,6 +30,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -127,7 +128,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index d253009f4..37f3d7e35 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -28,6 +28,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -214,7 +215,7 @@ public class GuiOredictionificator extends GuiMekanism { OredictionificatorFilter filter = tileEntity.filters.get(getFilterIndex()+i); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new OredictionificatorGuiMessage(OredictionificatorGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 1, getFilterIndex()+i, 0)); } } diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index de7e7339a..9ec0dd3eb 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -20,6 +20,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -310,19 +311,19 @@ public class GuiOredictionificatorFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 0, 52)); } if(xAxis >= 130 && xAxis <= 142 && yAxis >= 48 && yAxis <= 60) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); setFilter(); } if(xAxis >= 31 && xAxis <= 43 && yAxis >= 21 && yAxis <= 33) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); if(filter.filter != null) { @@ -342,7 +343,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism if(xAxis >= 63 && xAxis <= 75 && yAxis >= 21 && yAxis <= 33) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); if(filter.filter != null) { diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index d856d536f..413375f25 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -24,6 +24,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -209,7 +210,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism { setFrequency(frequencyField.getText()); frequencyField.setText(""); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index 0d141113f..71c49a81c 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -28,6 +28,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -161,7 +162,7 @@ public class GuiResistiveHeater extends GuiMekanism if(xAxis >= 116 && xAxis <= 126 && yAxis >= 51 && yAxis <= 61) { setEnergyUsage(); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index 87a50e929..dd86743bc 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -11,6 +11,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -105,29 +106,29 @@ public class GuiRobitCrafting extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 0, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 2, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 3, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 4, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, entityId, 0, 0); } diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index 99e08d862..8ba3cf020 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -12,6 +12,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -105,29 +106,29 @@ public class GuiRobitInventory extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 0, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 1, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 3, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 4, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 46150562d..04b251356 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -14,6 +14,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -268,51 +269,51 @@ public class GuiRobitMain extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 1, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 2, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 3, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 4, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.FOLLOW, robit.getEntityId(), 0, null)); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 54 && yAxis <= 72) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); toggleNameChange(); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 16 && yAxis <= 34) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GO_HOME, robit.getEntityId(), 0, null)); mc.displayGuiScreen(null); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 35 && yAxis <= 53) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.DROP_PICKUP, robit.getEntityId(), 0, null)); } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index ffd109acf..0300d9d89 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -15,6 +15,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerRepair; import net.minecraft.inventory.IContainerListener; @@ -152,31 +153,31 @@ public class GuiRobitRepair extends GuiMekanism implements IContainerListener if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 0, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 1, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 2, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 3, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java index c212cca14..206ed1722 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -12,6 +12,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import org.lwjgl.opengl.GL11; @@ -113,29 +114,29 @@ public class GuiRobitSmelting extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 0, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 1, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 2, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 4, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 824aed384..a890c25e8 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -32,6 +32,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -177,7 +178,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index f85b88890..0fef195f3 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -21,6 +21,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -151,7 +152,7 @@ public class GuiSecurityDesk extends GuiMekanism { addTrusted(trustedField.getText()); trustedField.setText(""); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } ArrayList data = new ArrayList(); diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index 7e8bbc6b6..0a9677eda 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -25,6 +25,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; @@ -230,13 +231,13 @@ public class GuiSideConfiguration extends GuiMekanism if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { int guiId = Mekanism.proxy.getGuiId(tile.getBlockType(), tile.getBlockMetadata()); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tile), 0, guiId)); } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.EJECT, Coord4D.get(tile), 0, 0, currentType)); } } @@ -253,7 +254,7 @@ public class GuiSideConfiguration extends GuiMekanism if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.SIDE_DATA, Coord4D.get(tile), button, i, currentType)); } } diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index 8cd7af810..6413631c6 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -14,6 +14,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -115,7 +116,7 @@ public class GuiTFilterSelect extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } } diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 100513a19..460df1a14 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -7,6 +7,7 @@ import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.MekanismSounds; import mekanism.common.content.transporter.TItemStackFilter; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; @@ -22,6 +23,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -301,7 +303,7 @@ public class GuiTItemStackFilter extends GuiMekanism { if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0, 0, 0)); } @@ -319,12 +321,12 @@ public class GuiTItemStackFilter extends GuiMekanism filter.itemType = null; } - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } if(xAxis >= 128 && xAxis <= 139 && yAxis >= 44 && yAxis <= 55) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); filter.sizeMode = !filter.sizeMode; } } @@ -336,7 +338,7 @@ public class GuiTItemStackFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { - SoundHandler.playSound("mekanism:etc.Ding"); + SoundHandler.playSound(MekanismSounds.DING); if(button == 0) { diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 10fa797ff..9a08a44e7 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -7,6 +7,7 @@ import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.MekanismSounds; import mekanism.common.content.transporter.TMaterialFilter; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; @@ -23,6 +24,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -232,7 +234,7 @@ public class GuiTMaterialFilter extends GuiMekanism { if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0, 0, 0)); } @@ -256,7 +258,7 @@ public class GuiTMaterialFilter extends GuiMekanism filter.materialItem = null; } - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } @@ -267,7 +269,7 @@ public class GuiTMaterialFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { - SoundHandler.playSound("mekanism:etc.Ding"); + SoundHandler.playSound(MekanismSounds.DING); if(button == 0) { diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index e3f059b3a..30714060e 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -8,6 +8,7 @@ import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.MekanismSounds; import mekanism.common.OreDictCache; import mekanism.common.content.transporter.TModIDFilter; import mekanism.common.content.transporter.TransporterFilter; @@ -25,6 +26,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -292,13 +294,13 @@ public class GuiTModIDFilter extends GuiMekanism { if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0, 0, 0)); } if(xAxis >= 131 && xAxis <= 143 && yAxis >= 47 && yAxis <= 59) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); setModID(); } } @@ -310,7 +312,7 @@ public class GuiTModIDFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { - SoundHandler.playSound("mekanism:etc.Ding"); + SoundHandler.playSound(MekanismSounds.DING); if(button == 0) { diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index de80fbf48..faedb52d6 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -8,6 +8,7 @@ import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.MekanismSounds; import mekanism.common.OreDictCache; import mekanism.common.content.transporter.TOreDictFilter; import mekanism.common.content.transporter.TransporterFilter; @@ -25,6 +26,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -292,13 +294,13 @@ public class GuiTOreDictFilter extends GuiMekanism { if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0, 0, 0)); } if(xAxis >= 131 && xAxis <= 143 && yAxis >= 47 && yAxis <= 59) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); setOreDictKey(); } } @@ -310,7 +312,7 @@ public class GuiTOreDictFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { - SoundHandler.playSound("mekanism:etc.Ding"); + SoundHandler.playSound(MekanismSounds.DING); if(button == 0) { diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 59323ede7..e22eeee07 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -31,6 +31,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -314,7 +315,7 @@ public class GuiTeleporter extends GuiMekanism { setFrequency(frequencyField.getText()); frequencyField.setText(""); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 16e510f72..b98b87132 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -23,6 +23,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; @@ -197,13 +198,13 @@ public class GuiTransporterConfig extends GuiMekanism if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { int guiId = Mekanism.proxy.getGuiId(tile.getBlockType(), tile.getBlockMetadata()); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tile), 0, guiId)); } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.STRICT_INPUT, Coord4D.get(tile), 0, 0, null)); } } @@ -215,7 +216,7 @@ public class GuiTransporterConfig extends GuiMekanism if(xAxis >= 122 && xAxis <= 138 && yAxis >= 49 && yAxis <= 65) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.EJECT_COLOR, Coord4D.get(tile), button, 0, null)); } @@ -226,7 +227,7 @@ public class GuiTransporterConfig extends GuiMekanism if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.INPUT_COLOR, Coord4D.get(tile), button, i, null)); } } diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 14036b9d1..f2ecda9c4 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -18,6 +18,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -303,13 +304,13 @@ public class GuiUpgradeManagement extends GuiMekanism if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { int guiId = MachineType.get(tile.getBlockType(), tile.getBlockMetadata()).guiId; - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tile), 0, guiId)); } if(selectedType != null && xAxis >= 136 && xAxis <= 148 && yAxis >= 57 && yAxis <= 69) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RemoveUpgradeMessage(Coord4D.get(tile), selectedType.ordinal())); } diff --git a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java index 3272e269d..cf0c846fc 100644 --- a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java @@ -8,6 +8,7 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -77,7 +78,7 @@ public class GuiBoilerTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) { tabType.openGui(tileEntity); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java index 45a0fa455..29afedf57 100644 --- a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java @@ -6,6 +6,7 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -114,7 +115,7 @@ public class GuiConfigTypeTab extends GuiElement { ((GuiSideConfiguration)guiObj).currentType = transmission; ((GuiSideConfiguration)guiObj).updateTabs(); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java index 976984978..5f1634b20 100644 --- a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java +++ b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java @@ -9,6 +9,7 @@ import mekanism.common.network.PacketContainerEditMode.ContainerEditModeMessage; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -83,7 +84,7 @@ public class GuiContainerEditMode extends GuiElement ContainerEditMode current = manager.getContainerEditMode(); int ordinalToSet = current.ordinal() < (ContainerEditMode.values().length-1) ? current.ordinal()+1 : 0; - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new ContainerEditModeMessage(Coord4D.get(tileEntity), ContainerEditMode.values()[ordinalToSet])); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java b/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java index 9165e6c3c..dad648bd0 100644 --- a/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java @@ -11,6 +11,7 @@ import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -80,7 +81,7 @@ public class GuiDetectionTab extends GuiElement data.add(3); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java index 2d05cef5b..e2a5cc268 100644 --- a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java @@ -8,6 +8,7 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -77,7 +78,7 @@ public class GuiMatrixTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) { tabType.openGui(tileEntity); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java index 4f139b17a..1251bc9f5 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java @@ -9,6 +9,7 @@ import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.network.PacketRedstoneControl.RedstoneControlMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -84,7 +85,7 @@ public class GuiRedstoneControl extends GuiElement int ordinalToSet = current.ordinal() < (RedstoneControl.values().length-1) ? current.ordinal()+1 : 0; if(ordinalToSet == RedstoneControl.PULSE.ordinal() && !control.canPulse()) ordinalToSet = 0; - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new RedstoneControlMessage(Coord4D.get(tileEntity), RedstoneControl.values()[ordinalToSet])); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index ff852df05..6738dc440 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -17,6 +17,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.SecurityUtils; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -180,7 +181,7 @@ public class GuiSecurityTab extends GuiElement SecurityMode current = getSecurity(); int ordinalToSet = current.ordinal() < (SecurityMode.values().length-1) ? current.ordinal()+1 : 0; - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); if(isItem) { diff --git a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java index efa9bd45b..26e658e46 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java @@ -8,6 +8,7 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -74,7 +75,7 @@ public class GuiSideConfigurationTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 0, 9)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java index 5054e2b2b..6fa856d8c 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -11,6 +11,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -79,7 +80,7 @@ public class GuiSortingTab extends GuiElement ArrayList data = new ArrayList(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java index 6c9a34a39..b6f3ab64d 100644 --- a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java @@ -8,6 +8,7 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -75,7 +76,7 @@ public class GuiTransporterConfigTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) { Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 0, 51)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java b/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java index e0a0fc9a6..ee23945fa 100644 --- a/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java @@ -8,6 +8,7 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -71,7 +72,7 @@ public class GuiUpgradeTab extends GuiElement if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 0, 43)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java b/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java index 9f828e489..e3cfd2e20 100644 --- a/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java @@ -6,6 +6,7 @@ import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.util.ResourceLocation; @@ -68,7 +69,7 @@ public class GuiVisualsTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { tileEntity.clientRendering = !tileEntity.clientRendering; - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java index 48c270016..c311ce40f 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java +++ b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java @@ -2,6 +2,7 @@ package mekanism.client.render.ctm; import java.util.Collections; import java.util.List; +import java.util.Map; import javax.annotation.Nullable; import javax.vecmath.Matrix4f; @@ -14,33 +15,35 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; -import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.FluentIterable; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; /** * Model for all chisel blocks */ @SuppressWarnings("deprecation") -public class CTMModelFactory implements ISmartBlockModel, ISmartItemModel, IPerspectiveAwareModel +public class CTMModelFactory implements IPerspectiveAwareModel { - public static final TRSRTransformation DEFAULT_BLOCK_THIRD_PERSON_TRANSOFRM = new TRSRTransformation(new Vector3f(0, 1.5f / 16f, -2.75f / 16f), TRSRTransformation.quatFromYXZDegrees(new Vector3f(10, -45, 170)), new Vector3f(0.375f, 0.375f, 0.375f), null); - public static final Matrix4f DEFAULT_BLOCK_THIRD_PERSON_MATRIX = DEFAULT_BLOCK_THIRD_PERSON_TRANSOFRM.getMatrix(); - private List face; private List general; private ModelCTM model; + + private CTMOverride override; public CTMModelFactory(List f, List g, ModelCTM m) { @@ -101,13 +104,6 @@ public class CTMModelFactory implements ISmartBlockModel, ISmartItemModel, IPers { return ItemCameraTransforms.DEFAULT; } - - @Override - public IBakedModel handleItemState(ItemStack stack) - { - Block block = ((ItemBlock)stack.getItem()).getBlock(); - return createModel(block.getDefaultState(), model, null); - } private CTMModelFactory createModel(IBlockState state, ModelCTM model, CTMBlockRenderContext ctx) { @@ -143,22 +139,51 @@ public class CTMModelFactory implements ISmartBlockModel, ISmartItemModel, IPers to.addAll(tex.transformQuad(q, ctx == null ? null : ctx, quadGoal)); } } + + private static TRSRTransformation get(float tx, float ty, float tz, float ax, float ay, float az, float s) + { + return new TRSRTransformation( + new Vector3f(tx / 16, ty / 16, tz / 16), + TRSRTransformation.quatFromXYZDegrees(new Vector3f(ax, ay, az)), + new Vector3f(s, s, s), + null); + } - private Pair thirdPersonTransform; + public static Map transforms = ImmutableMap.builder() + .put(TransformType.GUI, get(0, 0, 0, 30, 45, 0, 0.625f)) + .put(TransformType.THIRD_PERSON_RIGHT_HAND, get(0, 2.5f, 0, 75, 45, 0, 0.375f)) + .put(TransformType.THIRD_PERSON_LEFT_HAND, get(0, 2.5f, 0, 75, 45, 0, 0.375f)) + .put(TransformType.FIRST_PERSON_RIGHT_HAND, get(0, 0, 0, 0, 45, 0, 0.4f)) + .put(TransformType.FIRST_PERSON_LEFT_HAND, get(0, 0, 0, 0, 225, 0, 0.4f)) + .put(TransformType.GROUND, get(0, 2, 0, 0, 0, 0, 0.25f)) + .put(TransformType.HEAD, get(0, 0, 0, 0, 0, 0, 1)) + .put(TransformType.FIXED, get(0, 0, 0, 0, 0, 0, 1)) + .build(); @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - if(cameraTransformType == TransformType.THIRD_PERSON_RIGHT_HAND) - { - if(thirdPersonTransform == null) - { - thirdPersonTransform = ImmutablePair.of(this, DEFAULT_BLOCK_THIRD_PERSON_MATRIX); - } - - return thirdPersonTransform; - } - - return Pair.of(this, null); + return Pair.of(this, transforms.get(cameraTransformType).getMatrix()); } + + @Override + public ItemOverrideList getOverrides() + { + return override; + } + + private class CTMOverride extends ItemOverrideList + { + public CTMOverride() + { + super(Lists.newArrayList()); + } + + @Override + public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) + { + Block block = ((ItemBlock)stack.getItem()).getBlock(); + return createModel(block.getDefaultState(), model, null); + } + } } diff --git a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java index fd8815f2a..284ef222c 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java +++ b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java @@ -1,6 +1,5 @@ package mekanism.client.render.ctm; -import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -16,6 +15,7 @@ import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -42,9 +42,9 @@ public class CTMRegistry } @SubscribeEvent - public void onModelBake(ModelBakeEvent event) throws IOException + public void onModelBake(ModelBakeEvent event) throws Exception { - IModel model = event.getModelLoader().getModel(baseResource); + IModel model = ModelLoaderRegistry.getModel(baseResource); baseModel = model.bake(new TRSRTransformation(ModelRotation.X0_Y0), Attributes.DEFAULT_BAKED_FORMAT, r -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(r.toString())); for(Pair pair : ctmTypes) diff --git a/src/main/java/mekanism/client/render/ctm/Quad.java b/src/main/java/mekanism/client/render/ctm/Quad.java index 494483633..86e3afcc0 100644 --- a/src/main/java/mekanism/client/render/ctm/Quad.java +++ b/src/main/java/mekanism/client/render/ctm/Quad.java @@ -479,6 +479,8 @@ public class Quad private EnumFacing quadOrientation; + private boolean applyDiffuseLighting; + @Override public void setQuadTint(int tint) { @@ -498,7 +500,10 @@ public class Quad } @Override - public void setQuadColored() {} + public void setApplyDiffuseLighting(boolean lighting) + { + applyDiffuseLighting = lighting; + } private ListMultimap vertexData = MultimapBuilder.enumKeys(EnumUsage.class).arrayListValues().build(); diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index 982fc9cc8..681920307 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -4,6 +4,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.entity.EntityFlame; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -45,7 +46,7 @@ public class RenderFlame extends Render GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTick, 0.0F, 0.0F, 1.0F); Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + VertexBuffer worldrenderer = tessellator.getBuffer(); int i = 0; float f2 = 0.0F; diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 373e66d44..8fc18a7b0 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -58,13 +58,13 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.fluids.Fluid; @@ -462,11 +462,12 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel { prevTransform = cameraTransformType; - if(cameraTransformType == TransformType.THIRD_PERSON_RIGHT_HAND) - { - ForgeHooksClient.multiplyCurrentGlMatrix(CTMModelFactory.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); - } - - return Pair.of(this, null); + return Pair.of(this, CTMModelFactory.transforms.get(cameraTransformType).getMatrix()); } + + @Override + public ItemOverrideList getOverrides() + { + return ItemOverrideList.NONE; + } } diff --git a/src/main/java/mekanism/client/render/item/CustomItemModelFactory.java b/src/main/java/mekanism/client/render/item/CustomItemModelFactory.java index 3bfe189bb..6c7cddb35 100644 --- a/src/main/java/mekanism/client/render/item/CustomItemModelFactory.java +++ b/src/main/java/mekanism/client/render/item/CustomItemModelFactory.java @@ -2,36 +2,38 @@ package mekanism.client.render.item; import java.util.List; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; -public class CustomItemModelFactory implements ISmartItemModel +import com.google.common.collect.Lists; + +public class CustomItemModelFactory implements IBakedModel { private IBakedModel baseModel; + private MachineOverride override = new MachineOverride(); + public CustomItemModelFactory(IBakedModel base) { baseModel = base; } @Override - public IBakedModel handleItemState(ItemStack stack) + public ItemOverrideList getOverrides() { - return new BakedCustomItemModel(baseModel, stack); + return override; } @Override - public List getFaceQuads(EnumFacing p_177551_1_) - { - throw new UnsupportedOperationException(); - } - - @Override - public List getGeneralQuads() + public List getQuads(IBlockState state, EnumFacing facing, long rand) { throw new UnsupportedOperationException(); } @@ -65,4 +67,18 @@ public class CustomItemModelFactory implements ISmartItemModel { throw new UnsupportedOperationException(); } + + private class MachineOverride extends ItemOverrideList + { + public MachineOverride() + { + super(Lists.newArrayList()); + } + + @Override + public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) + { + return new BakedCustomItemModel(baseModel, stack); + } + } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index c27ef8ea8..93840e5f4 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -24,7 +24,7 @@ public class RenderBin extends TileEntitySpecialRenderer { Coord4D obj = Coord4D.get(tileEntity).offset(tileEntity.facing); - if(obj.getBlockState(tileEntity.getWorld()).getBlock().isSideSolid(tileEntity.getWorld(), obj.getPos(), tileEntity.facing.getOpposite())) + if(obj.getBlockState(tileEntity.getWorld()).isSideSolid(tileEntity.getWorld(), obj.getPos(), tileEntity.facing.getOpposite())) { return; } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index af035aa02..ce7861cd4 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -111,7 +111,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer (maxDist * maxDist) && theRobit.getFollowing() && theRobit.getEnergy() > 0 && theOwner.worldObj.provider.getDimensionId() == theRobit.worldObj.provider.getDimensionId(); + return !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(theOwner) > (maxDist * maxDist) && theRobit.getFollowing() && theRobit.getEnergy() > 0 && theOwner.worldObj.provider.getDimension() == theRobit.worldObj.provider.getDimension(); } @Override public void startExecuting() { ticker = 0; - avoidWater = theRobit.getNavigator().getAvoidsWater(); - theRobit.getNavigator().setAvoidsWater(false); + oldWaterCost = theRobit.getPathPriority(PathNodeType.WATER); + theRobit.setPathPriority(PathNodeType.WATER, 0.0F); } @Override @@ -101,7 +105,7 @@ public class RobitAIFollow extends EntityAIBase { theOwner = null; thePathfinder.clearPathEntity(); - theRobit.getNavigator().setAvoidsWater(avoidWater); + theRobit.setPathPriority(PathNodeType.WATER, oldWaterCost); } @Override @@ -128,7 +132,9 @@ public class RobitAIFollow extends EntityAIBase for(int i1 = 0; i1 <= 4; ++i1) { BlockPos pos = new BlockPos(x+l, y, z+i1); - if((l < 1 || i1 < 1 || l > 3 || i1 > 3) && World.doesBlockHaveSolidTopSurface(theWorld, pos.down()) && !theWorld.getBlockState(pos).getBlock().isNormalCube() && !theWorld.getBlockState(pos.up()).getBlock().isNormalCube()) + BlockPos under = new BlockPos(x + l, y - 1, z + i1); + + if((l < 1 || i1 < 1 || l > 3 || i1 > 3) && theWorld.getBlockState(under).isSideSolid(theWorld, under, EnumFacing.UP) && isEmptyBlock(pos) && isEmptyBlock(new BlockPos(x + l, y + 1, z + i1))) { theRobit.setLocationAndAngles((x + l) + 0.5F, y, (z + i1) + 0.5F, theRobit.rotationYaw, theRobit.rotationPitch); thePathfinder.clearPathEntity(); @@ -141,4 +147,12 @@ public class RobitAIFollow extends EntityAIBase } } } + + private boolean isEmptyBlock(BlockPos pos) + { + IBlockState iblockstate = theWorld.getBlockState(pos); + Block block = iblockstate.getBlock(); + + return block == Blocks.AIR ? true : !iblockstate.isFullCube(); + } } diff --git a/src/main/java/mekanism/common/RobitAIPickup.java b/src/main/java/mekanism/common/RobitAIPickup.java index 11268db78..6fe096912 100644 --- a/src/main/java/mekanism/common/RobitAIPickup.java +++ b/src/main/java/mekanism/common/RobitAIPickup.java @@ -4,9 +4,14 @@ import java.util.Iterator; import java.util.List; import mekanism.common.entity.EntityRobit; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; import net.minecraft.pathfinding.PathNavigate; +import net.minecraft.pathfinding.PathNodeType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -33,8 +38,8 @@ public class RobitAIPickup extends EntityAIBase /** The ticker for updates. */ private int ticker; - /** Whether or not this robit avoids water. */ - private boolean avoidWater; + private float oldWaterCost; + private EntityItem closest; public RobitAIPickup(EntityRobit entityRobit, float speed) @@ -95,22 +100,22 @@ public class RobitAIPickup extends EntityAIBase @Override public boolean continueExecuting() { - return !closest.isDead && !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(closest) > 100 && theRobit.getFollowing() && theRobit.getEnergy() > 0 && closest.worldObj.provider.getDimensionId() == theRobit.worldObj.provider.getDimensionId(); + return !closest.isDead && !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(closest) > 100 && theRobit.getFollowing() && theRobit.getEnergy() > 0 && closest.worldObj.provider.getDimension() == theRobit.worldObj.provider.getDimension(); } @Override public void startExecuting() { ticker = 0; - avoidWater = theRobit.getNavigator().getAvoidsWater(); - theRobit.getNavigator().setAvoidsWater(false); + oldWaterCost = theRobit.getPathPriority(PathNodeType.WATER); + theRobit.setPathPriority(PathNodeType.WATER, 0.0F); } @Override public void resetTask() { thePathfinder.clearPathEntity(); - theRobit.getNavigator().setAvoidsWater(avoidWater); + theRobit.setPathPriority(PathNodeType.WATER, oldWaterCost); } @Override @@ -140,10 +145,13 @@ public class RobitAIPickup extends EntityAIBase for(int i1 = 0; i1 <= 4; ++i1) { BlockPos pos = new BlockPos(x+l, y, z+i1); - if((l < 1 || i1 < 1 || l > 3 || i1 > 3) && World.doesBlockHaveSolidTopSurface(theWorld, pos.down()) && !theWorld.getBlockState(pos).getBlock().isNormalCube() && !theWorld.getBlockState(pos.up()).getBlock().isNormalCube()) + BlockPos under = new BlockPos(x + l, y - 1, z + i1); + + if((l < 1 || i1 < 1 || l > 3 || i1 > 3) && theWorld.getBlockState(under).isSideSolid(theWorld, under, EnumFacing.UP) && isEmptyBlock(pos) && isEmptyBlock(new BlockPos(x + l, y + 1, z + i1))) { theRobit.setLocationAndAngles((x + l) + 0.5F, y, (z + i1) + 0.5F, theRobit.rotationYaw, theRobit.rotationPitch); thePathfinder.clearPathEntity(); + return; } } @@ -153,4 +161,12 @@ public class RobitAIPickup extends EntityAIBase } } } + + private boolean isEmptyBlock(BlockPos pos) + { + IBlockState iblockstate = theWorld.getBlockState(pos); + Block block = iblockstate.getBlock(); + + return block == Blocks.AIR ? true : !iblockstate.isFullCube(); + } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 98a39e3e5..f52a1b511 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -385,10 +385,10 @@ public abstract class BlockBasic extends Block implements ICTMBlock } } default: - return super.canCreatureSpawn(world, pos, type); + return super.canCreatureSpawn(state, world, pos, type); } default: - return super.canCreatureSpawn(world, pos, type); + return super.canCreatureSpawn(state, world, pos, type); } } diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index eb941dcfa..e914551f0 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -202,7 +202,7 @@ public class BlockGasTank extends BlockContainer 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, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, getPickBlock(null, world, pos, player)); + EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, getPickBlock(state, null, world, pos, player)); world.spawnEntityInWorld(entityItem); } @@ -210,9 +210,9 @@ public class BlockGasTank extends BlockContainer return world.setBlockToAir(pos); } - public ItemStack dismantleBlock(World world, BlockPos pos, boolean returnBlock) + public ItemStack dismantleBlock(IBlockState state, World world, BlockPos pos, boolean returnBlock) { - ItemStack itemStack = getPickBlock(null, world, pos, null); + ItemStack itemStack = getPickBlock(state, null, world, pos, null); world.setBlockToAir(pos); @@ -296,13 +296,13 @@ public class BlockGasTank extends BlockContainer } @Override - public boolean hasComparatorInputOverride() + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos); return tileEntity.getRedstoneLevel(); diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index 968b21c6b..9336b1f56 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -9,6 +9,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; @@ -69,7 +70,7 @@ public class BlockObsidianTNT extends Block { EntityObsidianTNT entity = new EntityObsidianTNT(world, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F); world.spawnEntityInWorld(entity); - world.playSoundAtEntity(entity, "game.tnt.primed", 1.0F, 1.0F); + entity.playSound(SoundEvents.ENTITY_TNT_PRIMED, 1.0F, 1.0F); } } diff --git a/src/main/java/mekanism/common/content/transporter/Finder.java b/src/main/java/mekanism/common/content/transporter/Finder.java index fe885dcb0..d1ee9f4c9 100644 --- a/src/main/java/mekanism/common/content/transporter/Finder.java +++ b/src/main/java/mekanism/common/content/transporter/Finder.java @@ -108,7 +108,7 @@ public abstract class Finder return false; } - return Block.getBlockFromItem(stack.getItem()).getMaterial() == materialType; + return Block.getBlockFromItem(stack.getItem()).getStateFromMeta(stack.getItemDamage()).getMaterial() == materialType; } } diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index 752407da1..792db9c1d 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -19,7 +19,7 @@ public class TMaterialFilter extends TransporterFilter public Material getMaterial() { - return Block.getBlockFromItem(materialItem.getItem()).getMaterial(); + return Block.getBlockFromItem(materialItem.getItem()).getStateFromMeta(materialItem.getItemDamage()).getMaterial(); } @Override diff --git a/src/main/java/mekanism/common/entity/EntityBabySkeleton.java b/src/main/java/mekanism/common/entity/EntityBabySkeleton.java index 2a1237bdc..26dad293c 100644 --- a/src/main/java/mekanism/common/entity/EntityBabySkeleton.java +++ b/src/main/java/mekanism/common/entity/EntityBabySkeleton.java @@ -7,6 +7,9 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.world.World; public class EntityBabySkeleton extends EntitySkeleton @@ -14,6 +17,8 @@ public class EntityBabySkeleton extends EntitySkeleton private static final UUID babySpeedBoostUUID = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836"); private static final AttributeModifier babySpeedBoostModifier = new AttributeModifier(babySpeedBoostUUID, "Baby speed boost", 0.5D, 1); + private static final DataParameter IS_CHILD = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.BOOLEAN); + public EntityBabySkeleton(World world) { super(world); @@ -25,16 +30,16 @@ public class EntityBabySkeleton extends EntitySkeleton { super.entityInit(); - getDataWatcher().addObject(12, new Byte((byte)0)); + dataManager.register(IS_CHILD, false); } public void setChild(boolean child) { - getDataWatcher().updateObject(12, Byte.valueOf((byte)(child ? 1 : 0))); + dataManager.set(IS_CHILD, child); if(worldObj != null && !worldObj.isRemote) { - IAttributeInstance iattributeinstance = this.getEntityAttribute(SharedMonsterAttributes.movementSpeed); + IAttributeInstance iattributeinstance = this.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED); iattributeinstance.removeModifier(babySpeedBoostModifier); if(child) @@ -49,7 +54,7 @@ public class EntityBabySkeleton extends EntitySkeleton @Override public boolean isChild() { - return getDataWatcher().getWatchableObjectByte(12) == 1; + return dataManager.get(IS_CHILD); } @Override diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index de9f3e0cb..8939812ff 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -7,6 +7,7 @@ import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; +import mekanism.common.MekanismSounds; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.ParticleRedstone; @@ -14,6 +15,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -32,6 +36,12 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData public boolean hasCachedEntity; public UUID cachedEntityUUID; + + private static final DataParameter IS_LATCHED = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.BYTE); + private static final DataParameter LATCHED_X = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); + private static final DataParameter LATCHED_Y = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); + private static final DataParameter LATCHED_Z = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); + private static final DataParameter LATCHED_ID = EntityDataManager.createKey(Entity.class, DataSerializers.VARINT); public EntityBalloon(World world) { @@ -43,11 +53,11 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData setSize(0.25F, 0.25F); motionY = 0.04; - dataWatcher.addObject(5, (byte)0); /* Is latched */ - dataWatcher.addObject(6, 0); /* Latched X */ - dataWatcher.addObject(7, 0); /* Latched Y */ - dataWatcher.addObject(8, 0); /* Latched Z */ - dataWatcher.addObject(9, -1); /* Latched entity ID */ + dataManager.register(IS_LATCHED, (byte)0); + dataManager.register(LATCHED_X, 0); + dataManager.register(LATCHED_Y, 0); + dataManager.register(LATCHED_Z, 0); + dataManager.register(LATCHED_ID, -1); } public EntityBalloon(World world, double x, double y, double z, EnumColor c) @@ -76,11 +86,8 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData color = c; - dataWatcher.updateObject(5, (byte)2); /* Is latched */ - dataWatcher.updateObject(6, 0); /* Latched X */ - dataWatcher.updateObject(7, 0); /* Latched Y */ - dataWatcher.updateObject(8, 0); /* Latched Z */ - dataWatcher.updateObject(9, entity.getEntityId()); /* Latched entity ID */ + dataManager.set(IS_LATCHED, (byte)2); + dataManager.set(LATCHED_ID, entity.getEntityId()); } public EntityBalloon(World world, Coord4D obj, EnumColor c) @@ -96,11 +103,10 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData color = c; - dataWatcher.updateObject(5, (byte)1); /* Is latched */ - dataWatcher.updateObject(6, latched != null ? latched.xCoord : 0); /* Latched X */ - dataWatcher.updateObject(7, latched != null ? latched.yCoord : 0); /* Latched Y */ - dataWatcher.updateObject(8, latched != null ? latched.zCoord : 0); /* Latched Z */ - dataWatcher.updateObject(9, -1); /* Latched entity ID */ + dataManager.set(IS_LATCHED, (byte)1); + dataManager.set(LATCHED_X, latched != null ? latched.xCoord : 0); /* Latched X */ + dataManager.set(LATCHED_Y, latched != null ? latched.yCoord : 0); /* Latched Y */ + dataManager.set(LATCHED_Z, latched != null ? latched.zCoord : 0); /* Latched Z */ } @Override @@ -118,17 +124,17 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData if(worldObj.isRemote) { - if(dataWatcher.getWatchableObjectByte(5) == 1) + if(dataManager.get(IS_LATCHED) == 1) { - latched = new Coord4D(dataWatcher.getWatchableObjectInt(6), dataWatcher.getWatchableObjectInt(7), dataWatcher.getWatchableObjectInt(8), worldObj.provider.getDimensionId()); + latched = new Coord4D((int)dataManager.get(LATCHED_X), (int)dataManager.get(LATCHED_Y), (int)dataManager.get(LATCHED_Z), worldObj.provider.getDimension()); } else { latched = null; } - if(dataWatcher.getWatchableObjectByte(5) == 2) + if(dataManager.get(IS_LATCHED) == 2) { - latchedEntity = (EntityLivingBase)worldObj.getEntityByID(dataWatcher.getWatchableObjectInt(9)); + latchedEntity = (EntityLivingBase)worldObj.getEntityByID(dataManager.get(LATCHED_ID)); } else { latchedEntity = null; @@ -144,11 +150,11 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData if(ticksExisted == 1) { - dataWatcher.updateObject(5, new Byte(latched != null ? (byte)1 : (latchedEntity != null ? (byte)2 : (byte)0))); /* Is latched */ - dataWatcher.updateObject(6, new Integer(latched != null ? latched.xCoord : 0)); /* Latched X */ - dataWatcher.updateObject(7, new Integer(latched != null ? latched.yCoord : 0)); /* Latched Y */ - dataWatcher.updateObject(8, new Integer(latched != null ? latched.zCoord : 0)); /* Latched Z */ - dataWatcher.updateObject(9, new Integer(latchedEntity != null ? latchedEntity.getEntityId() : -1)); /* Latched entity ID */ + dataManager.set(IS_LATCHED, new Byte(latched != null ? (byte)1 : (latchedEntity != null ? (byte)2 : (byte)0))); + dataManager.set(LATCHED_X, new Integer(latched != null ? latched.xCoord : 0)); + dataManager.set(LATCHED_Y, new Integer(latched != null ? latched.yCoord : 0)); + dataManager.set(LATCHED_Z, new Integer(latched != null ? latched.zCoord : 0)); + dataManager.set(LATCHED_ID, new Integer(latchedEntity != null ? latchedEntity.getEntityId() : -1)); } } @@ -158,14 +164,14 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { latched = null; - dataWatcher.updateObject(5, (byte)0); /* Is latched */ + dataManager.set(IS_LATCHED, (byte)0); } if(latchedEntity != null && (latchedEntity.getHealth() <= 0 || latchedEntity.isDead || !worldObj.loadedEntityList.contains(latchedEntity))) { latchedEntity = null; - dataWatcher.updateObject(5, (byte)0); /* Is latched */ + dataManager.set(IS_LATCHED, (byte)0); } } @@ -253,7 +259,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData private void pop() { - worldObj.playSoundAtEntity(this, "mekanism:etc.Pop", 1, 1); + playSound(MekanismSounds.POP, 1, 1); if(worldObj.isRemote) { @@ -438,12 +444,12 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData return latched != null || latchedEntity != null; } else { - return dataWatcher.getWatchableObjectByte(5) > 0; + return dataManager.get(IS_LATCHED) > 0; } } public boolean isLatchedToEntity() { - return dataWatcher.getWatchableObjectByte(5) == 2 && latchedEntity != null; + return dataManager.get(IS_LATCHED) == 2 && latchedEntity != null; } } diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 6e88d3d87..7ca25f671 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -16,6 +16,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; @@ -202,7 +203,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData if(fluid) { spawnParticlesAt(new Pos3D(this)); - worldObj.playSoundAtEntity(this, "random.fizz", 1.0F, 1.0F); + playSound(SoundEvents.BLOCK_FIRE_EXTINGUISH, 1.0F, 1.0F); } } @@ -220,7 +221,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData item.ticksExisted = 0; spawnParticlesAt(new Pos3D(item)); - worldObj.playSoundAtEntity(item, "random.fizz", 1.0F, 1.0F); + playSound(SoundEvents.BLOCK_FIRE_EXTINGUISH, 1.0F, 1.0F); return true; } diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 4517ec2ab..92ab3fd2b 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -29,11 +29,15 @@ import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.DamageSource; @@ -59,14 +63,19 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public int furnaceCookTime = 0; public boolean texTick; + + private static final DataParameter ELECTRICITY = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.FLOAT); + private static final DataParameter OWNER = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.STRING); + private static final DataParameter FOLLOW = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.BOOLEAN); + private static final DataParameter DROP_PICKUP = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.BOOLEAN); public EntityRobit(World world) { super(world); setSize(0.5F, 0.5F); - - getNavigator().setAvoidsWater(true); + + getNavigator().setCanSwim(false); tasks.addTask(1, new RobitAIPickup(this, 1.0F)); tasks.addTask(2, new RobitAIFollow(this, 1.0F, 4.0F, 2.0F)); @@ -99,8 +108,8 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { super.applyEntityAttributes(); - getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.3); - getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(1); + getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.3); + getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(1); } @Override @@ -109,19 +118,15 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine return false; } - @Override - protected void updateAITick() {} - @Override protected void entityInit() { super.entityInit(); - dataWatcher.addObject(16, ""); /* Electricity */ - dataWatcher.addObject(17, ""); /* Owner */ - dataWatcher.addObject(18, (byte)0); /* Follow */ - //unused - dataWatcher.addObject(20, (byte)0); /* Drop Pickup */ + dataManager.register(ELECTRICITY, 0F); + dataManager.register(OWNER, ""); + dataManager.register(FOLLOW, false); + dataManager.register(DROP_PICKUP, false); } public double getRoundedTravelEnergy() @@ -272,7 +277,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine onItemPickup(item, item.getEntityItem().stackSize); item.setDead(); - playSound("random.pop", 1.0F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + playSound(SoundEvents.ENTITY_ITEM_PICKUP, 1.0F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); break; } @@ -291,7 +296,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine item.setDead(); } - playSound("random.pop", 1.0F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + playSound(SoundEvents.ENTITY_ITEM_PICKUP, 1.0F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); break; } @@ -517,16 +522,12 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public double getEnergy() { - try { - return Double.parseDouble(dataWatcher.getWatchableObjectString(16)); - } catch(Exception e) { - return 0; - } + return (float)dataManager.get(ELECTRICITY); } public void setEnergy(double energy) { - dataWatcher.updateObject(16, Double.toString(Math.max(Math.min(energy, MAX_ELECTRICITY), 0))); + dataManager.set(ELECTRICITY, (float)Math.max(Math.min(energy, MAX_ELECTRICITY), 0)); } public EntityPlayer getOwner() @@ -536,32 +537,32 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public String getOwnerName() { - return dataWatcher.getWatchableObjectString(17); + return dataManager.get(OWNER); } public void setOwner(String username) { - dataWatcher.updateObject(17, username); + dataManager.set(OWNER, username); } public boolean getFollowing() { - return dataWatcher.getWatchableObjectByte(18) == 1; + return dataManager.get(FOLLOW); } public void setFollowing(boolean follow) { - dataWatcher.updateObject(18, follow ? (byte)1 : (byte)0); + dataManager.set(FOLLOW, follow); } public boolean getDropPickup() { - return dataWatcher.getWatchableObjectByte(20) == 1; + return dataManager.get(DROP_PICKUP); } public void setDropPickup(boolean pickup) { - dataWatcher.updateObject(20, pickup ? (byte)1 : (byte)0); + dataManager.set(DROP_PICKUP, pickup); } @Override diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index 4e809aa81..76648ca4b 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -162,7 +162,7 @@ public class FrequencyManager if(dataHandler == null) { - dataHandler = (FrequencyDataHandler)world.getPerWorldStorage().loadData(FrequencyDataHandler.class, name); + dataHandler = (FrequencyDataHandler)world.getPerWorldStorage().getOrLoadData(FrequencyDataHandler.class, name); if(dataHandler == null) { @@ -182,7 +182,7 @@ public class FrequencyManager FrequencyManager manager = new FrequencyManager(freqClass, n); String name = manager.getName(); - FrequencyDataHandler handler = (FrequencyDataHandler)world.getPerWorldStorage().loadData(FrequencyDataHandler.class, name); + FrequencyDataHandler handler = (FrequencyDataHandler)world.getPerWorldStorage().getOrLoadData(FrequencyDataHandler.class, name); if(handler == null) { @@ -241,7 +241,7 @@ public class FrequencyManager { Coord4D coord = iter.next(); - if(coord.dimensionId == world.provider.getDimensionId()) + if(coord.dimensionId == world.provider.getDimension()) { if(!coord.exists(world)) { @@ -369,7 +369,7 @@ public class FrequencyManager } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { nbtTags.setString("frequencyClass", manager.frequencyClass.getName()); @@ -388,6 +388,8 @@ public class FrequencyManager } nbtTags.setTag("freqList", list); + + return nbtTags; } } } diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 945ddcbf9..31a580230 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; @@ -156,7 +157,7 @@ public class ItemAtomicDisassembler extends ItemEnergized if(!world.isRemote && entityplayer.isSneaking()) { toggleMode(itemstack); - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.modeToggle") + " " + EnumColor.INDIGO + getModeName(itemstack) + EnumColor.AQUA + " (" + getEfficiency(itemstack) + ")")); + entityplayer.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.modeToggle") + " " + EnumColor.INDIGO + getModeName(itemstack) + EnumColor.AQUA + " (" + getEfficiency(itemstack) + ")")); } return itemstack; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index fda417f6a..7bfb4f222 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -48,6 +48,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -55,8 +56,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -155,7 +158,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { BaseTier tier = type == MachineType.BASIC_FACTORY ? BaseTier.BASIC : (type == MachineType.ADVANCED_FACTORY ? BaseTier.ADVANCED : BaseTier.ELITE); - if(StatCollector.canTranslate("tile." + tier.getSimpleName() + RecipeType.values()[getRecipeType(itemstack)].getUnlocalizedName() + "Factory")) + if(I18n.canTranslate("tile." + tier.getSimpleName() + RecipeType.values()[getRecipeType(itemstack)].getUnlocalizedName() + "Factory")) { return LangUtils.localize("tile." + tier.getSimpleName() + RecipeType.values()[getRecipeType(itemstack)].getUnlocalizedName() + "Factory"); } @@ -442,7 +445,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return false; } else { - Material material = world.getBlockState(pos).getBlock().getMaterial(); + Material material = world.getBlockState(pos).getMaterial(); boolean flag = !material.isSolid(); if(!world.isAirBlock(pos) && !flag) @@ -452,7 +455,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec else { if(world.provider.doesWaterVaporize() && getFluidStack(itemstack).getFluid() == FluidRegistry.WATER) { - world.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + world.playSound(null, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); for(int l = 0; l < 8; l++) { diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index 3887fd987..2a880721f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -33,7 +34,7 @@ public class ItemBlockPlastic extends ItemBlock EnumColor colour = EnumColor.DYES[dyeColour.getDyeDamage()]; String colourName; - if(StatCollector.canTranslate(getUnlocalizedName(stack) + "." + colour.dyeName)) + if(I18n.canTranslate(getUnlocalizedName(stack) + "." + colour.dyeName)) { return LangUtils.localize(getUnlocalizedName(stack) + "." + colour.dyeName); } diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index b398f560e..2b8f14e06 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -81,7 +81,7 @@ public class MultiblockManager> for(Coord4D obj : entry.getValue().locations) { - if(obj.dimensionId == world.provider.getDimensionId() && obj.exists(world)) + if(obj.dimensionId == world.provider.getDimension() && obj.exists(world)) { TileEntity tileEntity = obj.getTileEntity(world); diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 3f61b639d..a5ea63e09 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -160,7 +160,7 @@ public abstract class UpdateProtocol> else { if(!isAir(origX+x, origY+y, origZ+z)) { - innerNodes.add(new Coord4D(origX+x, origY+y, origZ+z, pointer.getWorld().provider.getDimensionId())); + innerNodes.add(new Coord4D(origX+x, origY+y, origZ+z, pointer.getWorld().provider.getDimension())); } } diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 096d970a9..05dc5cd3e 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -149,7 +149,7 @@ public class PacketDigitalMinerGui implements IMessageHandler, } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setInteger("operatingTicks", operatingTicks); nbtTags.setBoolean("isActive", isActive); nbtTags.setInteger("controlType", controlType.ordinal()); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index efec49296..960bacf3b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -22,6 +22,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -29,6 +30,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; +import net.minecraft.util.SoundCategory; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -231,7 +233,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -253,6 +255,8 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento { nbtTags.setTag("itemType", itemType.writeToNBT(new NBTTagCompound())); } + + return nbtTags; } @Override @@ -610,7 +614,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento public boolean onSneakRightClick(EntityPlayer player, EnumFacing side) { setActive(!getActive()); - worldObj.playSoundEffect(getPos().getX(), getPos().getY(), getPos().getZ(), "random.click", 0.3F, 1); + worldObj.playSound(null, getPos().getX(), getPos().getY(), getPos().getZ(), SoundEvents.UI_BUTTON_CLICK, SoundCategory.BLOCKS, 0.3F, 1); return true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 38ccd653b..c538ac4d6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -173,11 +173,13 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setBoolean("isActive", isActive); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 7fb0018eb..3a057fbe4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -273,7 +273,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -284,6 +284,8 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock nbtTags.setTag("rightTank", inputTank.write(new NBTTagCompound())); nbtTags.setBoolean("sideDataStored", true); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 1724a6572..f69dbf05b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -348,7 +348,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -357,6 +357,8 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri nbtTags.setInteger("operatingTicks", operatingTicks); nbtTags.setTag("injectTank", injectTank.write(new NBTTagCompound())); nbtTags.setTag("gasTank", outputTank.write(new NBTTagCompound())); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index cb8868532..35d8bd6cf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -321,7 +321,7 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -331,6 +331,8 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl nbtTags.setTag("leftTank", leftTank.write(new NBTTagCompound())); nbtTags.setTag("rightTank", rightTank.write(new NBTTagCompound())); nbtTags.setTag("centerTank", centerTank.write(new NBTTagCompound())); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index ed344d6bb..dd00a1921 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -303,7 +303,7 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -311,6 +311,8 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp nbtTags.setInteger("controlType", controlType.ordinal()); nbtTags.setInteger("operatingTicks", operatingTicks); nbtTags.setTag("gasTank", gasTank.write(new NBTTagCompound())); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 6a2a53bb9..c41e19466 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -329,7 +329,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -339,6 +339,8 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple nbtTags.setTag("leftTank", fluidTank.writeToNBT(new NBTTagCompound())); nbtTags.setTag("rightTank", inputTank.write(new NBTTagCompound())); nbtTags.setTag("centerTank", outputTank.write(new NBTTagCompound())); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index ebf6c9845..1fce0deff 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -71,7 +71,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -92,6 +92,8 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl nbtTags.setTag("Items", tagList); } + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 27bdc2985..14e70dd20 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -676,7 +676,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -710,6 +710,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { nbtTags.setTag("filters", filterTags); } + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 13892fb81..f846cd4b9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -194,11 +194,13 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setDouble("electricityStored", getEnergy()); + + return nbtTags; } /** diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 779a55740..7ccd63c29 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -307,7 +307,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -339,6 +339,8 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { nbtTags.setTag("recurringNodes", recurringList); } + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 2253ebec3..0fda9c735 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -519,7 +519,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -536,6 +536,8 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp nbtTags.setInteger("dumpLeft", dumpLeft.ordinal()); nbtTags.setInteger("dumpRight", dumpRight.ordinal()); + + return nbtTags; } private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getWater", "getWaterNeeded", "getHydrogen", "getHydrogenNeeded", "getOxygen", "getOxygenNeeded"}; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index f0f89125b..769ac8ab9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -243,12 +243,14 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setInteger("tier", tier.ordinal()); nbtTags.setInteger("controlType", controlType.ordinal()); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 75f299cdf..69ea91566 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -830,7 +830,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -855,6 +855,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } nbtTags.setTag("gasTank", gasTank.write(new NBTTagCompound())); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 7a2abf1de..aec6ac3b7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -289,7 +289,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -301,6 +301,8 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc { nbtTags.setTag("fluidTank", fluidTank.writeToNBT(new NBTTagCompound())); } + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index c39567b9e..8886967d8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -278,7 +278,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -316,6 +316,8 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen { nbtTags.setTag("usedNodes", usedList); } + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index d60a51869..4252d6d16 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -553,7 +553,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -561,6 +561,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im nbtTags.setInteger("operatingTicks", operatingTicks); nbtTags.setInteger("controlType", controlType.ordinal()); nbtTags.setInteger("pulseOperations", pulseOperations); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index 877c2eedb..94ec53bce 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -129,7 +129,7 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -137,6 +137,8 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement nbtTags.setBoolean("isActive", isActive); nbtTags.setInteger("burnTime", burnTime); nbtTags.setInteger("maxBurnTime", maxBurnTime); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 300cc2942..51e5f6d7b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -284,7 +284,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -292,6 +292,8 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH nbtTags.setTag("gasTank", gasTank.write(new NBTTagCompound())); nbtTags.setInteger("dumping", dumping.ordinal()); nbtTags.setInteger("controlType", controlType.ordinal()); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java index 3b9d5de0d..2387cd35a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java @@ -68,12 +68,14 @@ public class TileEntityInductionCell extends TileEntityBasicBlock implements ISt } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setInteger("tier", tier.ordinal()); nbtTags.setDouble("electricityStored", electricityStored); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 004ed91c8..46cbb762c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -221,11 +221,13 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setBoolean("mode", mode); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java b/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java index 8bcc58cc4..0c2e9ebde 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java @@ -58,10 +58,12 @@ public class TileEntityInductionProvider extends TileEntityBasicBlock } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setInteger("tier", tier.ordinal()); + + return nbtTags; } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 90bf3f72f..d528d25ab 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -188,10 +188,12 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setBoolean("isActive", isActive); + + return nbtTags; } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 52f46a3db..d8ffddbb9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -274,7 +274,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -286,6 +286,8 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement nbtTags.setDouble("lastFired", lastFired); nbtTags.setInteger("controlType", controlType.ordinal()); nbtTags.setBoolean("entityDetection", entityDetection); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index f38a324a4..cfc6d21f6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -215,7 +215,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -244,6 +244,8 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { nbtTags.setTag("filters", filterTags); } + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index bd419ddce..d78851bc4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -363,7 +363,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -381,6 +381,8 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i } nbtTags.setBoolean("sideDataStored", true); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index c9381c817..b5e1e4ed7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -271,7 +271,7 @@ public abstract class TileEntityMultiblock> extend } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -280,6 +280,8 @@ public abstract class TileEntityMultiblock> extend nbtTags.setString("cachedID", cachedID); cachedData.save(nbtTags); } + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index d8e53a4e2..86136176f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -182,7 +182,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -201,6 +201,8 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple { nbtTags.setTag("filters", filterTags); } + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index aed1b0623..b429b3715 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -291,13 +291,15 @@ public class TileEntityPRC extends TileEntityBasicMachine= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 10)); } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index 13ae7a7a6..390bd365e 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -35,6 +35,7 @@ import mekanism.generators.client.gui.element.GuiStatTab; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fml.relauncher.Side; @@ -208,7 +209,7 @@ public class GuiReactorHeat extends GuiMekanism { if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 10)); } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index d105c7e9c..fcf977ccd 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -18,6 +18,7 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter.ReactorLogic; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -119,7 +120,7 @@ public class GuiReactorLogicAdapter extends GuiMekanism if(xAxis >= 23 && xAxis <= 34 && yAxis >= 19 && yAxis <= 30) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(0); @@ -135,7 +136,7 @@ public class GuiReactorLogicAdapter extends GuiMekanism { if(type != tileEntity.logicType) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); ArrayList data = new ArrayList(); data.add(1); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index 576400892..d7f75e735 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -23,6 +23,7 @@ import mekanism.generators.client.gui.element.GuiFuelTab; import mekanism.generators.client.gui.element.GuiHeatTab; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.SoundEvents; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -113,7 +114,7 @@ public class GuiReactorStats extends GuiMekanism { if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 10)); } } diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java index 896090223..6822403ee 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java @@ -9,6 +9,7 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -74,7 +75,7 @@ public class GuiFuelTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 38 && yAxis <= 56) { Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 12)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java index 60fc88f16..e16a6ae32 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java @@ -9,6 +9,7 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -74,7 +75,7 @@ public class GuiHeatTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 11)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java index 0e7645062..68c411e01 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java @@ -9,6 +9,7 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -74,7 +75,7 @@ public class GuiStatTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84) { Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 1, 13)); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java index 33c0522b8..9ce0e0c7a 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java @@ -9,6 +9,7 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -78,7 +79,7 @@ public class GuiTurbineTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) { tabType.openGui(tileEntity); - SoundHandler.playSound("gui.button.press"); + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } } diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index acfa87959..86cc86f36 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -72,7 +72,7 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer getFaceQuads(EnumFacing p_177551_1_) - { - throw new UnsupportedOperationException(); - } - - @Override - public List getGeneralQuads() + public List getQuads(IBlockState state, EnumFacing facing, long rand) { throw new UnsupportedOperationException(); } @@ -65,4 +67,18 @@ public class GeneratorItemModelFactory implements ISmartItemModel { throw new UnsupportedOperationException(); } + + private class GeneratorOverride extends ItemOverrideList + { + public GeneratorOverride() + { + super(Lists.newArrayList()); + } + + @Override + public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) + { + return new BakedGeneratorItemModel(baseModel, stack); + } + } } diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index ca5fbd992..993135a39 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -5,8 +5,9 @@ import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @@ -17,7 +18,7 @@ public class GeneratorsItems public static final ItemHohlraum Hohlraum = (ItemHohlraum)new ItemHohlraum().setUnlocalizedName("Hohlraum"); public static final Item TurbineBlade = new ItemMekanism() { @Override - public boolean doesSneakBypassUse(World world, BlockPos pos, EntityPlayer player) + public boolean doesSneakBypassUse(ItemStack stack, IBlockAccess world, BlockPos pos, EntityPlayer player) { return world.getTileEntity(pos) instanceof TileEntityTurbineRotor; } @@ -25,9 +26,9 @@ public class GeneratorsItems public static void register() { - GameRegistry.registerItem(SolarPanel, "SolarPanel"); - GameRegistry.registerItem(Hohlraum, "Hohlraum"); - GameRegistry.registerItem(TurbineBlade, "TurbineBlade"); + GameRegistry.register(SolarPanel); + GameRegistry.register(Hohlraum); + GameRegistry.register(TurbineBlade); MekanismGenerators.proxy.registerItemRenders(); } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index e9654bff4..d6c933ef6 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -600,7 +600,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock } @Override - public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { @@ -609,7 +609,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock 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, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, getPickBlock(null, world, pos, player)); + EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, getPickBlock(state, null, world, pos, player)); world.spawnEntityInWorld(entityItem); } @@ -618,10 +618,9 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); - IBlockState state = world.getBlockState(pos); ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, state.getBlock().getMetaFromState(state)); if(itemStack.getTagCompound() == null) @@ -676,9 +675,9 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock return itemStack; } - public ItemStack dismantleBlock(World world, BlockPos pos, boolean returnBlock) + public ItemStack dismantleBlock(IBlockState state, World world, BlockPos pos, boolean returnBlock) { - ItemStack itemStack = getPickBlock(null, world, pos, null); + ItemStack itemStack = getPickBlock(state, null, world, pos, null); world.setBlockToAir(pos); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index d5147ee7a..04db870c5 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -163,11 +163,13 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setInteger("bioFuelStored", bioFuelSlot.fluidStored); + + return nbtTags; } public int getFuel(ItemStack itemstack) diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index c78a48151..f7191960e 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -315,11 +315,13 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setTag("fuelTank", fuelTank.write(new NBTTagCompound())); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 6f254fcc5..0e7b5f50a 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -186,12 +186,14 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setBoolean("isActive", isActive); nbtTags.setInteger("controlType", controlType.ordinal()); + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 52cdefa17..7277dfc19 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -185,7 +185,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); @@ -193,6 +193,8 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu { nbtTags.setTag("lavaTank", lavaTank.writeToNBT(new NBTTagCompound())); } + + return nbtTags; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index 0d37d095d..4a5aae7b0 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -151,7 +151,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); @@ -176,6 +176,8 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen tag.setTag("tritiumTank", tritiumTank.write(new NBTTagCompound())); tag.setTag("waterTank", waterTank.writeToNBT(new NBTTagCompound())); tag.setTag("steamTank", steamTank.writeToNBT(new NBTTagCompound())); + + return tag; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index 922716a5c..677f5be99 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -88,12 +88,14 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setInteger("logicType", logicType.ordinal()); nbtTags.setBoolean("activeCooled", activeCooled); + + return nbtTags; } @Override