geforkt von Mirrors/FastAsyncWorldEdit
Remove Trove usage temporarily due to shading issues with Gradle build.
Dieser Commit ist enthalten in:
Ursprung
b752604c03
Commit
5dd7b83940
@ -46,7 +46,7 @@ dependencies {
|
||||
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.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'
|
||||
}
|
||||
|
||||
|
10
pom.xml
10
pom.xml
@ -151,12 +151,12 @@
|
||||
</dependency>
|
||||
|
||||
<!-- Optimized collections -->
|
||||
<dependency>
|
||||
<!--<dependency>
|
||||
<groupId>net.sf.trove4j</groupId>
|
||||
<artifactId>trove4j</artifactId>
|
||||
<version>3.0.3</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependency> disabled until we can shadow this in Forge -->
|
||||
|
||||
<!-- @Nullable etc. -->
|
||||
<dependency>
|
||||
@ -381,14 +381,14 @@
|
||||
<include>com.sk89q:jchronic</include>
|
||||
<include>com.thoughtworks.paranamer:paranamer</include>
|
||||
<include>com.google.code.gson:gson</include>
|
||||
<include>net.sf.trove4j:trove4j</include>
|
||||
<!-- <include>net.sf.trove4j:trove4j</include> -->
|
||||
</includes>
|
||||
</artifactSet>
|
||||
<relocations>
|
||||
<relocation>
|
||||
<!-- <relocation>
|
||||
<pattern>gnu.trove</pattern>
|
||||
<shadedPattern>com.sk89q.worldedit.internal.trove</shadedPattern>
|
||||
</relocation>
|
||||
</relocation> -->
|
||||
<relocation>
|
||||
<pattern>com.google.gson</pattern>
|
||||
<shadedPattern>com.sk89q.worldedit.internal.gson</shadedPattern>
|
||||
|
@ -26,8 +26,6 @@ import com.google.gson.reflect.TypeToken;
|
||||
import com.sk89q.worldedit.Vector;
|
||||
import com.sk89q.worldedit.blocks.BlockMaterial;
|
||||
import com.sk89q.worldedit.util.gson.VectorAdapter;
|
||||
import gnu.trove.map.TIntObjectMap;
|
||||
import gnu.trove.map.hash.TIntObjectHashMap;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.io.IOException;
|
||||
@ -56,7 +54,7 @@ public class BundledBlockData {
|
||||
private static final BundledBlockData INSTANCE = new BundledBlockData();
|
||||
|
||||
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.
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren