diff --git a/.gitignore b/.gitignore index a472544..aa2dfc1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ gradle/ gradlew gradlew.bat bin/ -build/ \ No newline at end of file +build/ diff --git a/build.gradle b/build.gradle index 231947f..e04cded 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ targetCompatibility = 1.7 minecraft { - version = "1.7.10-10.13.0.1189" + version = "1.7.10-10.13.0.1207" if(file('../run').exists()) { @@ -42,13 +42,11 @@ minecraft } } -task update(dependsOn:['eclipse', 'setupDevWorkspace']) - -task deobfJar(type:Jar, dependsOn:'classes') -deobfJar +task devJar(type:Jar, dependsOn:'classes') +devJar { - classifier = 'deobf' - archiveName = "${archivesBaseName}-${version}-deobf.jar" + classifier = 'dev' + archiveName = "${archivesBaseName}-${version}-dev.jar" from ('build/classes/main') { include('clashsoft/brewingapi/**') @@ -59,11 +57,11 @@ deobfJar } } -task sourceJar(type:Jar, dependsOn:'classes') -sourceJar +task srcJar(type:Jar, dependsOn:'classes') +srcJar { - classifier = 'sources' - archiveName = "${archivesBaseName}-${version}-sources.jar" + classifier = 'src' + archiveName = "${archivesBaseName}-${version}-src.jar" from ('build/sources/java') { include('clashsoft/brewingapi/**') @@ -74,7 +72,7 @@ sourceJar } } -task buildApi(dependsOn:['build', 'sourceJar', 'deobfJar']) +task buildApi(dependsOn:['build', 'srcJar', 'devJar']) processResources { diff --git a/libs/ClashsoftLib-1.7.10-2.3.0-deobf.jar b/libs/ClashsoftLib-1.7.10-2.5.0-dev.jar similarity index 55% rename from libs/ClashsoftLib-1.7.10-2.3.0-deobf.jar rename to libs/ClashsoftLib-1.7.10-2.5.0-dev.jar index 4820ae4..66f7d3b 100644 Binary files a/libs/ClashsoftLib-1.7.10-2.3.0-deobf.jar and b/libs/ClashsoftLib-1.7.10-2.5.0-dev.jar differ diff --git a/libs/ClashsoftLib-1.7.10-2.3.0-src.jar b/libs/ClashsoftLib-1.7.10-2.5.0-src.jar similarity index 50% rename from libs/ClashsoftLib-1.7.10-2.3.0-src.jar rename to libs/ClashsoftLib-1.7.10-2.5.0-src.jar index c88e823..6aa7023 100644 Binary files a/libs/ClashsoftLib-1.7.10-2.3.0-src.jar and b/libs/ClashsoftLib-1.7.10-2.5.0-src.jar differ diff --git a/src/main/java/clashsoft/brewingapi/BrewingAPI.java b/src/main/java/clashsoft/brewingapi/BrewingAPI.java index c808cad..174e5db 100644 --- a/src/main/java/clashsoft/brewingapi/BrewingAPI.java +++ b/src/main/java/clashsoft/brewingapi/BrewingAPI.java @@ -19,11 +19,11 @@ import clashsoft.brewingapi.tileentity.TileEntityBrewingStand2; import clashsoft.cslib.config.CSConfig; import clashsoft.cslib.logging.CSLog; +import clashsoft.cslib.minecraft.CSLib; import clashsoft.cslib.minecraft.block.CSBlocks; import clashsoft.cslib.minecraft.command.CSCommand; import clashsoft.cslib.minecraft.crafting.CSCrafting; import clashsoft.cslib.minecraft.entity.CSEntities; -import clashsoft.cslib.minecraft.init.CSLib; import clashsoft.cslib.minecraft.init.ClashsoftMod; import clashsoft.cslib.minecraft.item.CSItems; import clashsoft.cslib.minecraft.stack.CSStacks; diff --git a/src/main/java/clashsoft/brewingapi/item/ItemPotion2.java b/src/main/java/clashsoft/brewingapi/item/ItemPotion2.java index 4e48395..c4ab3c5 100644 --- a/src/main/java/clashsoft/brewingapi/item/ItemPotion2.java +++ b/src/main/java/clashsoft/brewingapi/item/ItemPotion2.java @@ -536,8 +536,7 @@ else if (potionType.isBadEffect()) String localizedDescription = I18n.getString(description); if (localizedDescription != description) { - localizedDescription = CSString.cutString(localizedDescription, stack.getDisplayName().length()); - for (String line : CSString.lineArray(localizedDescription)) + for (String line : CSString.cutString(localizedDescription, stack.getDisplayName().length())) { list.add("\u00a79\u00a7k" + line); }