Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix everything #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix everything #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ 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"
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 1 addition & 5 deletions src/main/java/Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
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) {
Expand Down
13 changes: 4 additions & 9 deletions src/main/java/me/cortex/TreeCracker/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
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 kaptainwutax.mcutils.rand.ChunkRand;
import kaptainwutax.mcutils.version.MCVersion;
import kaptainwutax.seedutils.rand.JRand;
import me.cortex.TreeCracker.program.TreeCrackerProgram;
import me.cortex.TreeCracker.trees.ICrackableTree;
import me.cortex.TreeCracker.trees.Simple112BlobTree;
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 {
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/me/cortex/TreeCracker/postProcessor/PostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
10 changes: 0 additions & 10 deletions src/main/java/me/cortex/TreeCracker/program/CudaProgram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down