From 986ce14f2eb9df8d9b2d9bbf499ece707416d581 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 27 May 2017 19:39:24 -0700 Subject: [PATCH] Bump version, fixed Purification Chamber sounds, fixed empty Configurator mode --- build.properties | 2 +- src/main/java/mekanism/common/Mekanism.java | 4 +- .../common/item/ItemConfigurator.java | 37 +++++++------------ .../generators/common/MekanismGenerators.java | 4 +- .../mekanism/tools/common/MekanismTools.java | 4 +- .../resources/assets/mekanism/sounds.json | 2 +- 6 files changed, 21 insertions(+), 32 deletions(-) diff --git a/build.properties b/build.properties index b6cfa1fd4..7221b7293 100644 --- a/build.properties +++ b/build.properties @@ -3,4 +3,4 @@ mappings_version=snapshot_20161220 forge_version=13.20.0.2304 mcmp_version=2.0.0_19 jei_version=4.2.9.247 -mod_version=9.3.0 +mod_version=9.3.1 diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index bd397a3e4..19a518901 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -162,7 +162,7 @@ import com.mojang.authlib.GameProfile; * @author AidanBrady * */ -@Mod(modid = "mekanism", name = "Mekanism", version = "9.3.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "mekanism", name = "Mekanism", version = "9.3.1", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:mcmultipart;" + "after:jei;" + "after:buildcraft;" + @@ -195,7 +195,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(9, 3, 0); + public static Version versionNumber = new Version(9, 3, 1); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 4ff0fdcbf..d93b7e0b9 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -161,32 +161,21 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool float yRandom = random.nextFloat() * 0.8F + 0.1F; float zRandom = random.nextFloat() * 0.8F + 0.1F; - while(slotStack.getCount() > 0) + EntityItem item = new EntityItem(world, pos.getX() + xRandom, pos.getY() + yRandom, pos.getZ() + zRandom, slotStack.copy()); + + if(slotStack.hasTagCompound()) { - int j = random.nextInt(21) + 10; - - if(j > slotStack.getCount()) - { - j = slotStack.getCount(); - } - - slotStack.shrink(j); - EntityItem item = new EntityItem(world, pos.getX() + xRandom, pos.getY() + yRandom, pos.getZ() + zRandom, new ItemStack(slotStack.getItem(), j, slotStack.getItemDamage())); - - if(slotStack.hasTagCompound()) - { - item.getEntityItem().setTagCompound((NBTTagCompound)slotStack.getTagCompound().copy()); - } - - float k = 0.05F; - item.motionX = random.nextGaussian() * k; - item.motionY = random.nextGaussian() * k + 0.2F; - item.motionZ = random.nextGaussian() * k; - world.spawnEntity(item); - - inv.setInventorySlotContents(i, ItemStack.EMPTY); - setEnergy(stack, getEnergy(stack) - ENERGY_PER_ITEM_DUMP); + item.getEntityItem().setTagCompound((NBTTagCompound)slotStack.getTagCompound().copy()); } + + float k = 0.05F; + item.motionX = random.nextGaussian() * k; + item.motionY = random.nextGaussian() * k + 0.2F; + item.motionZ = random.nextGaussian() * k; + world.spawnEntity(item); + + inv.setInventorySlotContents(i, ItemStack.EMPTY); + setEnergy(stack, getEnergy(stack) - ENERGY_PER_ITEM_DUMP); } } diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 48e7f3325..9f7e0d56f 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -47,7 +47,7 @@ import net.minecraftforge.oredict.OreDictionary; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; -@Mod(modid = "mekanismgenerators", name = "MekanismGenerators", version = "9.3.0", dependencies = "required-after:mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "mekanismgenerators", name = "MekanismGenerators", version = "9.3.1", dependencies = "required-after:mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { @SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy") @@ -57,7 +57,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(9, 3, 0); + public static Version versionNumber = new Version(9, 3, 1); public static MultiblockManager turbineManager = new MultiblockManager("industrialTurbine"); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 10931d5d2..6210357f0 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -32,7 +32,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = "mekanismtools", name = "MekanismTools", version = "9.3.0", dependencies = "required-after:mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "mekanismtools", name = "MekanismTools", version = "9.3.1", dependencies = "required-after:mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") @@ -42,7 +42,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(9, 3, 0); + public static Version versionNumber = new Version(9, 3, 1); //Enums: Tools public static ToolMaterial toolOBSIDIAN; diff --git a/src/main/resources/assets/mekanism/sounds.json b/src/main/resources/assets/mekanism/sounds.json index 6a82f604a..812130740 100644 --- a/src/main/resources/assets/mekanism/sounds.json +++ b/src/main/resources/assets/mekanism/sounds.json @@ -33,7 +33,7 @@ "tile.machine.metalinfuser": {"category": "block", "sounds": [{"name": "mekanism:MetallurgicInfuser", "stream": false}]}, "tile.machine.sawmill": {"category": "block", "sounds": [{"name": "mekanism:PrecisionSawmill", "stream": false}]}, "tile.machine.prc": {"category": "block", "sounds": [{"name": "mekanism:PressurizedReactionChamber", "stream": false}]}, - "tile.machine.purification": {"category": "block", "sounds": [{"name": "mekanism:PurificationChamber", "stream": false}]}, + "tile.machine.purifier": {"category": "block", "sounds": [{"name": "mekanism:PurificationChamber", "stream": false}]}, "tile.machine.smelter": {"category": "block", "sounds": [{"name": "mekanism:Smelter", "stream": false}]}, "tile.machine.laser": {"category": "block", "sounds": [{"name": "mekanism:Laser", "stream": false}]}, "tile.machine.fusionreactor": {"category": "block", "sounds": [{"name": "mekanism:FusionReactor", "stream": false}]},