morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

updated deps

Browse Source
This commit is contained in:
C10udburst
2022-02-16 10:13:49 +01:00
parent 4eec0c00e3
commit cfcb4a683a
8 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
build.gradle
View File

@@ -9,18 +9,16 @@ version = project.mod_version
group = project.maven_group
repositories {
maven {
name = "jitpack"
url = "https://jitpack.io"
}
maven {
name = "meteor-maven"
url = "https://maven.meteordev.org/releases"
}
maven {
name = "meteor-maven-snapshots"
url = "https://maven.meteordev.org/snapshots"
mavenCentral()
maven { url "https://maven.meteordev.org/releases"}
maven { url "https://maven.meteordev.org/snapshots" }
maven { url "https://maven.seedfinding.com/" }
maven { url "https://maven-snapshots.seedfinding.com/" }
}
configurations {
// configuration that holds jars to include in the jar
extraLibs
}
dependencies {
@@ -29,17 +27,17 @@ dependencies {
mappings "net.fabricmc:yarn:${project.yarn_version}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
// Fabric API. This is technically optional, but you probably want it anyway.
// modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
// You may need to force-disable transitiveness on them.
modImplementation("meteordevelopment:meteor-client:SNAPSHOT")
// Seed .locate features
modImplementation 'com.github.hube12:SEED:master-SNAPSHOT'
include 'com.github.hube12:SEED:master-SNAPSHOT'
extraLibs('com.seedfinding:mc_math:0eb505174da8a92550f8ec6efe254e0fa936cc0d') {transitive = false}
extraLibs('com.seedfinding:mc_seed:5518e3ba3ee567fb0b51c15958967f70a6a19e02') {transitive = false}
extraLibs('com.seedfinding:mc_core:88b246597e0147e37b38d1b33e9526e6c3eb1469') {transitive = false}
extraLibs('com.seedfinding:mc_noise:a6ab8e6c688491829f8d2adf845392da22ef8e9c') {transitive = false}
extraLibs('com.seedfinding:mc_biome:b2271807a047bb43ac60c8c20ad47e315f19b9a6') {transitive = false}
extraLibs('com.seedfinding:mc_terrain:9e937ddb838e28e79423c287fa18b1ce66f061d7') {transitive = false}
extraLibs('com.seedfinding:mc_feature:ef939c0dd7d66ab1bd290d6aab1e42a12cb3dbf1') {transitive = false}
configurations.implementation.extendsFrom(configurations.extraLibs)
}
processResources {
@@ -52,6 +50,18 @@ processResources {
}
}
jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
}
from {
configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) }
}
}
tasks.withType(Jar) {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly

6
gradle.properties
View File

@@ -2,9 +2,9 @@
org.gradle.jvmargs=-Xmx2G
# Fabric Properties
minecraft_version=1.18
yarn_version=1.18+build.1
loader_version=0.12.6
minecraft_version=1.18.1
yarn_version=1.18.1+build.14
loader_version=0.12.12
# Mod Properties
mod_version = 0.1

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

1
settings.gradle
View File

@@ -5,6 +5,5 @@ pluginManagement {
url = 'https://maven.fabricmc.net/'
}
gradlePluginPortal()
jcenter()
}
}

2
src/main/java/anticope/rejects/commands/SeedCommand.java
View File

@@ -9,7 +9,7 @@ import net.minecraft.command.CommandSource;
import net.minecraft.text.BaseText;
import net.minecraft.text.LiteralText;
import kaptainwutax.mcutils.version.MCVersion;
import com.seedfinding.mccore.version.MCVersion;
import meteordevelopment.meteorclient.systems.commands.Command;
import anticope.rejects.utils.seeds.Seed;
import anticope.rejects.utils.seeds.Seeds;

20
src/main/java/anticope/rejects/utils/WorldGenUtils.java
View File

@@ -3,15 +3,15 @@ package anticope.rejects.utils;
import anticope.rejects.utils.seeds.Seed;
import anticope.rejects.utils.seeds.Seeds;
import baritone.api.BaritoneAPI;
import kaptainwutax.biomeutils.source.BiomeSource;
import kaptainwutax.featureutils.misc.SlimeChunk;
import kaptainwutax.featureutils.structure.*;
import kaptainwutax.mcutils.rand.ChunkRand;
import kaptainwutax.mcutils.state.Dimension;
import kaptainwutax.mcutils.util.data.SpiralIterator;
import kaptainwutax.mcutils.util.pos.*;
import kaptainwutax.mcutils.version.MCVersion;
import kaptainwutax.terrainutils.TerrainGenerator;
import com.seedfinding.mcbiome.source.BiomeSource;
import com.seedfinding.mcfeature.misc.SlimeChunk;
import com.seedfinding.mcfeature.structure.*;
import com.seedfinding.mccore.rand.ChunkRand;
import com.seedfinding.mccore.state.Dimension;
import com.seedfinding.mccore.util.data.SpiralIterator;
import com.seedfinding.mccore.util.pos.*;
import com.seedfinding.mccore.version.MCVersion;
import com.seedfinding.mcterrain.TerrainGenerator;
import meteordevelopment.meteorclient.utils.player.ChatUtils;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
@@ -270,7 +270,7 @@ public class WorldGenUtils {
return StreamSupport.stream(spiralIterator.spliterator(), false)
.filter(cPos -> {
kaptainwutax.featureutils.Feature.Data<Mineshaft> data = mineshaft.at(cPos.getX(), cPos.getZ());
com.seedfinding.mcfeature.Feature.Data<Mineshaft> data = mineshaft.at(cPos.getX(), cPos.getZ());
return data.testStart(source.getWorldSeed(), chunkRand) && data.testBiome(source) && data.testGenerate(terrainGenerator);
})
.findAny().map(cPos -> cPos.toBlockPos().add(9, 0, 9)).orElse(null);

2
src/main/java/anticope/rejects/utils/seeds/Seed.java
View File

@@ -1,6 +1,6 @@
package anticope.rejects.utils.seeds;
import kaptainwutax.mcutils.version.MCVersion;
import com.seedfinding.mccore.version.MCVersion;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtLong;

2
src/main/java/anticope/rejects/utils/seeds/Seeds.java
View File

@@ -11,7 +11,7 @@ import net.minecraft.text.HoverEvent;
import net.minecraft.text.LiteralText;
import net.minecraft.util.Formatting;
import kaptainwutax.mcutils.version.MCVersion;
import com.seedfinding.mccore.version.MCVersion;
import meteordevelopment.meteorclient.MeteorClient;
import meteordevelopment.meteorclient.systems.System;
import meteordevelopment.meteorclient.systems.config.Config;