From 7f50c705716c837b0023a54d361cc6b2abba9aa3 Mon Sep 17 00:00:00 2001 From: Leon Date: Sun, 26 Mar 2017 11:34:44 -0400 Subject: [PATCH] final 1.7.10 build --- build.gradle | 4 ++-- src/main/java/net/machinemuse/powersuits/common/Config.java | 2 +- .../net/machinemuse/powersuits/event/MovementManager.java | 2 +- .../net/machinemuse/powersuits/event/PlayerUpdateHandler.java | 2 +- .../powersuits/powermodule/misc/WaterElectrolyzerModule.java | 2 +- .../powersuits/powermodule/movement/JetBootsModule.java | 2 +- .../powersuits/powermodule/movement/JetPackModule.java | 2 +- .../powersuits/powermodule/movement/SwimAssistModule.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 94bac73..a1f30ac 100644 --- a/build.gradle +++ b/build.gradle @@ -40,10 +40,10 @@ configFile.withReader { def buildnumber = System.getenv("BUILD_NUMBER") def travisbuildnumber = (System.getenv("TRAVIS_BUILD_NUMBER") ?: -111).toInteger() + 111 -version = "${minecraft_version}-${mod_version}.${buildnumber ?: travisbuildnumber}" +version = "${config.minecraft_version}-${config.mod_version}." + (buildnumber ?: travisbuildnumber) group= "${config.group_id}" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "${config.mod_id}" -def numina_version = (System.getenv("NUMINA_VERSION") ?:"0.4.1.104") +def numina_version = (System.getenv("NUMINA_VERSION") ?:"0.4.1.105") minecraft { version = "${config.minecraft_version}-${config.forge_version}" diff --git a/src/main/java/net/machinemuse/powersuits/common/Config.java b/src/main/java/net/machinemuse/powersuits/common/Config.java index 19002df..cfd3492 100644 --- a/src/main/java/net/machinemuse/powersuits/common/Config.java +++ b/src/main/java/net/machinemuse/powersuits/common/Config.java @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import net.machinemuse.api.IPowerModule; import net.machinemuse.api.ModuleManager; import net.machinemuse.api.IModularItem; -import net.machinemuse.numina.common.Numina; +import net.machinemuse.numina.basemod.Numina; import net.machinemuse.numina.general.MuseLogger; import net.machinemuse.powersuits.common.proxy.CommonProxy; import net.machinemuse.powersuits.powermodule.armor.*; diff --git a/src/main/java/net/machinemuse/powersuits/event/MovementManager.java b/src/main/java/net/machinemuse/powersuits/event/MovementManager.java index f7a7a0d..68ddee5 100644 --- a/src/main/java/net/machinemuse/powersuits/event/MovementManager.java +++ b/src/main/java/net/machinemuse/powersuits/event/MovementManager.java @@ -5,7 +5,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import net.machinemuse.api.ModuleManager; import net.machinemuse.general.sound.SoundDictionary; -import net.machinemuse.numina.common.NuminaConfig; +import net.machinemuse.numina.basemod.NuminaConfig; import net.machinemuse.numina.sound.Musique; import net.machinemuse.powersuits.item.ItemPowerArmor; import net.machinemuse.powersuits.powermodule.movement.JumpAssistModule; diff --git a/src/main/java/net/machinemuse/powersuits/event/PlayerUpdateHandler.java b/src/main/java/net/machinemuse/powersuits/event/PlayerUpdateHandler.java index 95c4961..b199573 100644 --- a/src/main/java/net/machinemuse/powersuits/event/PlayerUpdateHandler.java +++ b/src/main/java/net/machinemuse/powersuits/event/PlayerUpdateHandler.java @@ -4,7 +4,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.machinemuse.api.ModuleManager; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.general.sound.SoundDictionary; -import net.machinemuse.numina.common.NuminaConfig; +import net.machinemuse.numina.basemod.NuminaConfig; import net.machinemuse.numina.general.MuseMathUtils; import net.machinemuse.numina.sound.Musique; import net.machinemuse.powersuits.common.Config; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/WaterElectrolyzerModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/WaterElectrolyzerModule.java index 66dc9c5..10b1513 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/WaterElectrolyzerModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/WaterElectrolyzerModule.java @@ -7,7 +7,7 @@ import net.machinemuse.api.ModuleManager; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.general.sound.SoundDictionary; -import net.machinemuse.numina.common.NuminaConfig; +import net.machinemuse.numina.basemod.NuminaConfig; import net.machinemuse.numina.sound.Musique; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetBootsModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetBootsModule.java index 0b3ffd3..8efc082 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetBootsModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetBootsModule.java @@ -7,7 +7,7 @@ import net.machinemuse.api.ModuleManager; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.general.sound.SoundDictionary; -import net.machinemuse.numina.common.NuminaConfig; +import net.machinemuse.numina.basemod.NuminaConfig; import net.machinemuse.numina.sound.Musique; import net.machinemuse.powersuits.control.PlayerInputMap; import net.machinemuse.powersuits.item.ItemComponent; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetPackModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetPackModule.java index 8842022..a5be879 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetPackModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetPackModule.java @@ -7,7 +7,7 @@ import net.machinemuse.api.ModuleManager; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.general.sound.SoundDictionary; -import net.machinemuse.numina.common.NuminaConfig; +import net.machinemuse.numina.basemod.NuminaConfig; import net.machinemuse.numina.sound.Musique; import net.machinemuse.powersuits.control.PlayerInputMap; import net.machinemuse.powersuits.item.ItemComponent; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/SwimAssistModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/SwimAssistModule.java index 0bd7ded..ccfbfb5 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/SwimAssistModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/SwimAssistModule.java @@ -7,7 +7,7 @@ import net.machinemuse.api.ModuleManager; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.general.sound.SoundDictionary; -import net.machinemuse.numina.common.NuminaConfig; +import net.machinemuse.numina.basemod.NuminaConfig; import net.machinemuse.numina.sound.Musique; import net.machinemuse.powersuits.control.PlayerInputMap; import net.machinemuse.powersuits.item.ItemComponent;