Skip to content

Commit bfcd2e3

Browse files
committed
Update libs
Update to Forge 1.7.10-10.13.0.1207 Update to Clashsoft Lib 1.7.10-2.5.0
1 parent 021acce commit bfcd2e3

File tree

6 files changed

+13
-16
lines changed

6 files changed

+13
-16
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ gradle/
77
gradlew
88
gradlew.bat
99
bin/
10-
build/
10+
build/

build.gradle

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ targetCompatibility = 1.7
3030

3131
minecraft
3232
{
33-
version = "1.7.10-10.13.0.1189"
33+
version = "1.7.10-10.13.0.1207"
3434

3535
if(file('../run').exists())
3636
{
@@ -42,13 +42,11 @@ minecraft
4242
}
4343
}
4444

45-
task update(dependsOn:['eclipse', 'setupDevWorkspace'])
46-
47-
task deobfJar(type:Jar, dependsOn:'classes')
48-
deobfJar
45+
task devJar(type:Jar, dependsOn:'classes')
46+
devJar
4947
{
50-
classifier = 'deobf'
51-
archiveName = "${archivesBaseName}-${version}-deobf.jar"
48+
classifier = 'dev'
49+
archiveName = "${archivesBaseName}-${version}-dev.jar"
5250
from ('build/classes/main')
5351
{
5452
include('clashsoft/brewingapi/**')
@@ -59,11 +57,11 @@ deobfJar
5957
}
6058
}
6159

62-
task sourceJar(type:Jar, dependsOn:'classes')
63-
sourceJar
60+
task srcJar(type:Jar, dependsOn:'classes')
61+
srcJar
6462
{
65-
classifier = 'sources'
66-
archiveName = "${archivesBaseName}-${version}-sources.jar"
63+
classifier = 'src'
64+
archiveName = "${archivesBaseName}-${version}-src.jar"
6765
from ('build/sources/java')
6866
{
6967
include('clashsoft/brewingapi/**')
@@ -74,7 +72,7 @@ sourceJar
7472
}
7573
}
7674

77-
task buildApi(dependsOn:['build', 'sourceJar', 'deobfJar'])
75+
task buildApi(dependsOn:['build', 'srcJar', 'devJar'])
7876

7977
processResources
8078
{

src/main/java/clashsoft/brewingapi/BrewingAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import clashsoft.brewingapi.tileentity.TileEntityBrewingStand2;
2020
import clashsoft.cslib.config.CSConfig;
2121
import clashsoft.cslib.logging.CSLog;
22+
import clashsoft.cslib.minecraft.CSLib;
2223
import clashsoft.cslib.minecraft.block.CSBlocks;
2324
import clashsoft.cslib.minecraft.command.CSCommand;
2425
import clashsoft.cslib.minecraft.crafting.CSCrafting;
2526
import clashsoft.cslib.minecraft.entity.CSEntities;
26-
import clashsoft.cslib.minecraft.init.CSLib;
2727
import clashsoft.cslib.minecraft.init.ClashsoftMod;
2828
import clashsoft.cslib.minecraft.item.CSItems;
2929
import clashsoft.cslib.minecraft.stack.CSStacks;

src/main/java/clashsoft/brewingapi/item/ItemPotion2.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,8 +536,7 @@ else if (potionType.isBadEffect())
536536
String localizedDescription = I18n.getString(description);
537537
if (localizedDescription != description)
538538
{
539-
localizedDescription = CSString.cutString(localizedDescription, stack.getDisplayName().length());
540-
for (String line : CSString.lineArray(localizedDescription))
539+
for (String line : CSString.cutString(localizedDescription, stack.getDisplayName().length()))
541540
{
542541
list.add("\u00a79\u00a7k" + line);
543542
}

0 commit comments

Comments
 (0)