Do not shade lombok

This commit is contained in:
Jonas Herzig
2018-03-01 18:33:43 +01:00
parent 94c33df308
commit 180fda20d7
12 changed files with 13 additions and 54 deletions

View File

@@ -1,5 +1,6 @@
package com.replaymod.core.utils; package com.replaymod.core.utils;
import com.google.common.base.Throwables;
import com.google.common.net.PercentEscaper; import com.google.common.net.PercentEscaper;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
@@ -17,7 +18,6 @@ import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.layout.VerticalLayout; import de.johni0702.minecraft.gui.layout.VerticalLayout;
import de.johni0702.minecraft.gui.popup.GuiInfoPopup; import de.johni0702.minecraft.gui.popup.GuiInfoPopup;
import de.johni0702.minecraft.gui.utils.Colors; import de.johni0702.minecraft.gui.utils.Colors;
import lombok.SneakyThrows;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.network.NetworkPlayerInfo; import net.minecraft.client.network.NetworkPlayerInfo;
import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.DefaultPlayerSkin;
@@ -150,13 +150,14 @@ public class Utils {
return REPLAY_NAME_ENCODER.escape(replayName) + ".mcpr"; return REPLAY_NAME_ENCODER.escape(replayName) + ".mcpr";
} }
@SneakyThrows(UnsupportedEncodingException.class)
public static String fileNameToReplayName(String fileName) { public static String fileNameToReplayName(String fileName) {
String baseName = FilenameUtils.getBaseName(fileName); String baseName = FilenameUtils.getBaseName(fileName);
try { try {
return URLDecoder.decode(baseName, Charsets.UTF_8.name()); return URLDecoder.decode(baseName, Charsets.UTF_8.name());
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return baseName; return baseName;
} catch (UnsupportedEncodingException e) {
throw Throwables.propagate(e);
} }
} }

View File

@@ -10,7 +10,3 @@ minecraft {
version = '1.10.2-12.18.2.2099' version = '1.10.2-12.18.2.2099'
mappings = "snapshot_20160518" mappings = "snapshot_20160518"
} }
dependencies {
shade project(':jGui:versions:1.9.4')
}

View File

@@ -10,7 +10,3 @@ minecraft {
version = '1.11.2-13.20.0.2216' version = '1.11.2-13.20.0.2216'
mappings = "snapshot_20161220" mappings = "snapshot_20161220"
} }
dependencies {
shade project(':jGui:versions:1.9.4')
}

View File

@@ -10,7 +10,3 @@ minecraft {
version = '1.11-13.19.1.2188' version = '1.11-13.19.1.2188'
mappings = "snapshot_20161111" mappings = "snapshot_20161111"
} }
dependencies {
shade project(':jGui:versions:1.9.4')
}

View File

@@ -10,7 +10,3 @@ minecraft {
version = '1.12.1-14.22.0.2444' version = '1.12.1-14.22.0.2444'
mappings = "snapshot_20170615" mappings = "snapshot_20170615"
} }
dependencies {
shade project(':jGui:versions:1.12')
}

View File

@@ -10,7 +10,3 @@ minecraft {
version = '1.12.2-14.23.0.2486' version = '1.12.2-14.23.0.2486'
mappings = "snapshot_20170615" mappings = "snapshot_20170615"
} }
dependencies {
shade project(':jGui:versions:1.12')
}

View File

@@ -10,7 +10,3 @@ minecraft {
version = '1.12-14.21.1.2387' version = '1.12-14.21.1.2387'
mappings = "snapshot_20170615" mappings = "snapshot_20170615"
} }
dependencies {
shade project(':jGui:versions:1.12')
}

View File

@@ -10,7 +10,3 @@ minecraft {
version = '1.8.9-11.15.1.1722' version = '1.8.9-11.15.1.1722'
mappings = "stable_22" mappings = "stable_22"
} }
dependencies {
shade project(':jGui:versions:1.8.9')
}

View File

@@ -10,7 +10,3 @@ minecraft {
version = '1.8-11.14.4.1563' version = '1.8-11.14.4.1563'
mappings = "snapshot_nodoc_20141130" mappings = "snapshot_nodoc_20141130"
} }
dependencies {
shade project(':jGui:versions:1.8')
}

View File

@@ -10,7 +10,3 @@ minecraft {
version = '1.9.4-12.17.0.1976' version = '1.9.4-12.17.0.1976'
mappings = "snapshot_20160518" mappings = "snapshot_20160518"
} }
dependencies {
shade project(':jGui:versions:1.9.4')
}

View File

@@ -83,8 +83,18 @@ dependencies {
if (studioVersion == '1.8.9') studioVersion = '1.8' if (studioVersion == '1.8.9') studioVersion = '1.8'
shade("com.github.ReplayMod.ReplayStudio:$studioVersion:9fd96a7"){ shade("com.github.ReplayMod.ReplayStudio:$studioVersion:9fd96a7"){
exclude group: 'com.google.guava', module: 'guava' // provided by MC exclude group: 'com.google.guava', module: 'guava' // provided by MC
exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used
} }
def jGuiVersion = project.name
if (['1.10.2', '1.11', '1.11.2'].contains(jGuiVersion)) jGuiVersion = '1.9.4'
if (['1.12.1', '1.12.2'].contains(jGuiVersion)) jGuiVersion = '1.12'
shade(project(":jGui:versions:$jGuiVersion")){
exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used
}
compile 'org.projectlombok:lombok:1.16.6' // runtime only for @SneakyThrows which isn't used
testCompile 'junit:junit:4.11' testCompile 'junit:junit:4.11'
} }

View File

@@ -67,19 +67,3 @@ minecraft {
//#endif //#endif
//#endif //#endif
} }
dependencies {
//#if MC>=11200
shade project(':jGui:versions:1.12')
//#else
//#if MC>=10904
//$$ shade project(':jGui:versions:1.9.4')
//#else
//#if MC>=10809
//$$ shade project(':jGui:versions:1.8.9')
//#else
//$$ shade project(':jGui:versions:1.8')
//#endif
//#endif
//#endif
}