Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Trove usage temporarily due to shading issues with Gradle build.

Browse Source
This commit is contained in:
sk89q 2014-07-23 16:20:43 -07:00
parent b752604c03
commit 5dd7b83940
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -46,7 +46,7 @@ dependencies {
compile group: 'com.google.code.findbugs', name: 'jsr305', version: '1.3.9' compile group: 'com.google.code.findbugs', name: 'jsr305', version: '1.3.9'
compile group: 'com.thoughtworks.paranamer', name: 'paranamer', version: '2.6' compile group: 'com.thoughtworks.paranamer', name: 'paranamer', version: '2.6'
compile group: 'com.google.code.gson', name: 'gson', version: '2.2.4' compile group: 'com.google.code.gson', name: 'gson', version: '2.2.4'
compile group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3' //compile group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'
testCompile group: 'org.mockito', name: 'mockito-core', version:'1.9.0-rc1' testCompile group: 'org.mockito', name: 'mockito-core', version:'1.9.0-rc1'
} }

10
pom.xml
View File

@ -151,12 +151,12 @@
</dependency> </dependency>
<!-- Optimized collections --> <!-- Optimized collections -->
<dependency> <!--<dependency>
<groupId>net.sf.trove4j</groupId> <groupId>net.sf.trove4j</groupId>
<artifactId>trove4j</artifactId> <artifactId>trove4j</artifactId>
<version>3.0.3</version> <version>3.0.3</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency> disabled until we can shadow this in Forge -->
<!-- @Nullable etc. --> <!-- @Nullable etc. -->
<dependency> <dependency>
@ -381,14 +381,14 @@
<include>com.sk89q:jchronic</include> <include>com.sk89q:jchronic</include>
<include>com.thoughtworks.paranamer:paranamer</include> <include>com.thoughtworks.paranamer:paranamer</include>
<include>com.google.code.gson:gson</include> <include>com.google.code.gson:gson</include>
<include>net.sf.trove4j:trove4j</include> <!-- <include>net.sf.trove4j:trove4j</include> -->
</includes> </includes>
</artifactSet> </artifactSet>
<relocations> <relocations>
<relocation> <!-- <relocation>
<pattern>gnu.trove</pattern> <pattern>gnu.trove</pattern>
<shadedPattern>com.sk89q.worldedit.internal.trove</shadedPattern> <shadedPattern>com.sk89q.worldedit.internal.trove</shadedPattern>
</relocation> </relocation> -->
<relocation> <relocation>
<pattern>com.google.gson</pattern> <pattern>com.google.gson</pattern>
<shadedPattern>com.sk89q.worldedit.internal.gson</shadedPattern> <shadedPattern>com.sk89q.worldedit.internal.gson</shadedPattern>

4
src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java
View File

@ -26,8 +26,6 @@ import com.google.gson.reflect.TypeToken;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BlockMaterial; import com.sk89q.worldedit.blocks.BlockMaterial;
import com.sk89q.worldedit.util.gson.VectorAdapter; import com.sk89q.worldedit.util.gson.VectorAdapter;
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.hash.TIntObjectHashMap;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
@ -56,7 +54,7 @@ public class BundledBlockData {
private static final BundledBlockData INSTANCE = new BundledBlockData(); private static final BundledBlockData INSTANCE = new BundledBlockData();
private final Map<String, BlockEntry> idMap = new HashMap<String, BlockEntry>(); private final Map<String, BlockEntry> idMap = new HashMap<String, BlockEntry>();
private final TIntObjectMap<BlockEntry> legacyMap = new TIntObjectHashMap<BlockEntry>(); private final Map<Integer, BlockEntry> legacyMap = new HashMap<Integer, BlockEntry>(); // Trove usage removed temporarily
/** /**
* Create a new instance. * Create a new instance.