From a03d6d6d40077e7728141fb4f91d2f19695580a5 Mon Sep 17 00:00:00 2001
From: Neil <h66r10@gmail.com>
Date: Mon, 6 Sep 2021 19:31:19 +0200
Subject: [PATCH] fix every import
---
build.gradle | 13 ++++++-------
gradle/wrapper/gradle-wrapper.properties | 2 +-
src/main/java/Test.java | 6 ------
src/main/java/me/cortex/TreeCracker/Main.java | 13 ++++---------
.../TreeCracker/postProcessor/PostProcessor.java | 7 -------
.../me/cortex/TreeCracker/program/CudaProgram.java | 10 ----------
.../TreeCracker/program/opencl/OpenCLContext.java | 1 -
.../program/opencl/OpenCLGPUOnlyMemory.java | 2 +-
.../TreeCracker/program/opencl/OpenCLKernel.java | 1 -
.../program/opencl/OpenCLKernelParameter.java | 1 -
.../TreeCracker/program/opencl/OpenCLProgram.java | 3 ---
.../program/opencl/OpenCLSyncableMemory.java | 1 -
12 files changed, 12 insertions(+), 48 deletions(-)
diff --git a/build.gradle b/build.gradle
index 3809eda..e257601 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,16 +10,15 @@ repositories {
maven {
url "https://jitpack.io"
}
+ maven{
+ url "https://maven.latticg.com"
+ }
}
dependencies {
- compile group: 'commons-io', name: 'commons-io', version: '2.8.0'
- compile('com.github.KaptainWutax:MathUtils:master-SNAPSHOT') {transitive = false}
- compile('com.github.KaptainWutax:SeedUtils:master-SNAPSHOT') {transitive = false}
- compile('com.github.KaptainWutax:FeatureUtils:master-SNAPSHOT') {transitive = false}
- compile('com.github.KaptainWutax:BiomeUtils:master-SNAPSHOT') {transitive = false}
- compile('com.github.KaptainWutax:ChunkRandomReversal:master-SNAPSHOT') {transitive = false}
- compile('com.github.KaptainWutax:LattiCG:master-SNAPSHOT') {transitive = false}
+ implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
+ implementation "com.github.hube12:SEED:b80304e54"
+ implementation "com.seedfinding:latticg:1.06@jar"
implementation group: 'org.jocl', name: 'jocl', version: '2.0.4'
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be52383..69a9715 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/main/java/Test.java b/src/main/java/Test.java
index 165986d..3350b4f 100644
--- a/src/main/java/Test.java
+++ b/src/main/java/Test.java
@@ -1,9 +1,3 @@
-import kaptainwutax.seedutils.lcg.LCG;
-import kaptainwutax.seedutils.lcg.rand.JRand;
-import kaptainwutax.seedutils.mc.ChunkRand;
-import kaptainwutax.seedutils.mc.MCVersion;
-import me.cortex.TreeCracker.LCG.DiscreteLog;
-
public class Test {
public static void main(String[] args) {
diff --git a/src/main/java/me/cortex/TreeCracker/Main.java b/src/main/java/me/cortex/TreeCracker/Main.java
index 47aa6fb..0be41bb 100644
--- a/src/main/java/me/cortex/TreeCracker/Main.java
+++ b/src/main/java/me/cortex/TreeCracker/Main.java
@@ -1,18 +1,13 @@
package me.cortex.TreeCracker;
-import kaptainwutax.seedutils.lcg.rand.JRand;
-import kaptainwutax.seedutils.mc.ChunkRand;
-import kaptainwutax.seedutils.mc.MCVersion;
-import me.cortex.TreeCracker.LCG.ConfiguredLcg;
-import me.cortex.TreeCracker.LCG.LcgTester;
-import me.cortex.TreeCracker.postProcessor.PostProcessor;
-import me.cortex.TreeCracker.program.CudaProgram;
import me.cortex.TreeCracker.program.TreeCrackerProgram;
-import me.cortex.TreeCracker.trees.*;
+import me.cortex.TreeCracker.trees.Simple112BlobTree;
+import me.cortex.TreeCracker.trees.Simple113BlobTree;
+import me.cortex.TreeCracker.trees.Simple116BlobTree;
+import me.cortex.TreeCracker.trees.TreePos;
import java.io.File;
import java.io.IOException;
-import java.util.Random;
public class Main {
public static void main(String[] args) throws IOException {
diff --git a/src/main/java/me/cortex/TreeCracker/postProcessor/PostProcessor.java b/src/main/java/me/cortex/TreeCracker/postProcessor/PostProcessor.java
index 5318f9a..115f186 100644
--- a/src/main/java/me/cortex/TreeCracker/postProcessor/PostProcessor.java
+++ b/src/main/java/me/cortex/TreeCracker/postProcessor/PostProcessor.java
@@ -1,14 +1,7 @@
package me.cortex.TreeCracker.postProcessor;
-import kaptainwutax.seedutils.lcg.LCG;
-import kaptainwutax.seedutils.lcg.rand.JRand;
-import me.cortex.TreeCracker.LCG.DiscreteLog;
import me.cortex.TreeCracker.NotImplementedException;
import me.cortex.TreeCracker.program.TreeCrackerProgram;
-import randomreverser.util.Pair;
-
-import java.util.*;
-import java.util.stream.Collectors;
//TODO: CLEAN UP THIS CODE
public class PostProcessor {
diff --git a/src/main/java/me/cortex/TreeCracker/program/CudaProgram.java b/src/main/java/me/cortex/TreeCracker/program/CudaProgram.java
index 42cacac..8cfcb6f 100644
--- a/src/main/java/me/cortex/TreeCracker/program/CudaProgram.java
+++ b/src/main/java/me/cortex/TreeCracker/program/CudaProgram.java
@@ -1,22 +1,12 @@
package me.cortex.TreeCracker.program;
-import me.cortex.TreeCracker.LCG.ConfiguredLcg;
-import me.cortex.TreeCracker.LCG.LcgTester;
import org.apache.commons.io.IOUtils;
-import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
import java.nio.charset.Charset;
import java.nio.file.Files;
-import java.nio.file.OpenOption;
-import java.nio.file.StandardOpenOption;
-import java.util.Comparator;
-import java.util.stream.Collectors;
-
-import static me.cortex.TreeCracker.LCG.LcgComparison.GetInvertedTypeStringOperator;
public class CudaProgram {
private String currentSource;
diff --git a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLContext.java b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLContext.java
index b8f667e..0879116 100644
--- a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLContext.java
+++ b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLContext.java
@@ -3,7 +3,6 @@
import org.jocl.*;
import static org.jocl.CL.*;
-import static org.jocl.CL.CL_PLATFORM_PROFILE;
public class OpenCLContext {
public final cl_context context;
diff --git a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLGPUOnlyMemory.java b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLGPUOnlyMemory.java
index d59a1b0..74c6da9 100644
--- a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLGPUOnlyMemory.java
+++ b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLGPUOnlyMemory.java
@@ -1,7 +1,7 @@
package me.cortex.TreeCracker.program.opencl;
import org.jocl.Pointer;
-import org.jocl.*;
+import org.jocl.cl_mem;
import static org.jocl.CL.*;
diff --git a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLKernel.java b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLKernel.java
index 4f621df..da6138d 100644
--- a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLKernel.java
+++ b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLKernel.java
@@ -5,7 +5,6 @@
import org.jocl.cl_kernel;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import static org.jocl.CL.*;
diff --git a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLKernelParameter.java b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLKernelParameter.java
index ca72797..c8fc93f 100644
--- a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLKernelParameter.java
+++ b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLKernelParameter.java
@@ -1,7 +1,6 @@
package me.cortex.TreeCracker.program.opencl;
import me.cortex.TreeCracker.NotImplementedException;
-import org.jocl.Pointer;
import java.nio.Buffer;
diff --git a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLProgram.java b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLProgram.java
index 69cf7d6..264b5a7 100644
--- a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLProgram.java
+++ b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLProgram.java
@@ -1,10 +1,7 @@
package me.cortex.TreeCracker.program.opencl;
-import org.jocl.Pointer;
import org.jocl.cl_program;
-import java.util.Arrays;
-
import static org.jocl.CL.*;
public class OpenCLProgram extends OpenCLComponent {
diff --git a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLSyncableMemory.java b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLSyncableMemory.java
index 18601a5..87d1f1e 100644
--- a/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLSyncableMemory.java
+++ b/src/main/java/me/cortex/TreeCracker/program/opencl/OpenCLSyncableMemory.java
@@ -1,7 +1,6 @@
package me.cortex.TreeCracker.program.opencl;
import org.jocl.Pointer;
-import org.jocl.Sizeof;
import org.jocl.cl_mem;
import java.nio.Buffer;