diff --git a/.gitignore b/.gitignore index e8817bd..21b3274 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ /build/ /.gradle/ /local-lib/ -/src/main/resources/assets/halplibe/block/ diff --git a/build.gradle b/build.gradle index 9171a6e..e329179 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,22 @@ repositories { } metadataSources { artifact() } } + ivy { + url = "https://github.com/Turnip-Labs" + patternLayout { + artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar" + m2compatible = true + } + metadataSources { artifact() } + } + ivy { + url = "https://github.com/Turnip-Labs" + patternLayout { + artifact "[organisation]/releases/download/[revision]/[module]-bta-[revision].jar" + m2compatible = true + } + metadataSources { artifact() } + } ivy { url = "https://piston-data.mojang.com" patternLayout { @@ -55,6 +71,21 @@ repositories { } metadataSources { artifact() } } + ivy { + url = "https://github.com/UselessBullets" + patternLayout { + artifact "[organisation]/releases/download/[revision]/[module]-bta-[revision].jar" + m2compatible = true + } + metadataSources { artifact() } + } + ivy { + url = uri("https://github.com/UselessBullets") + patternLayout { + artifact("[organisation]/releases/download/v[revision]/[module]-[revision].jar") + } + metadataSources { artifact() } + } } dependencies { @@ -67,11 +98,16 @@ dependencies { implementation "org.slf4j:slf4j-api:1.8.0-beta4" implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0" + implementation 'com.google.guava:guava:30.0-jre' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1' + var log4jVersion = "2.20.0" implementation("org.apache.logging.log4j:log4j-core:${log4jVersion}") implementation("org.apache.logging.log4j:log4j-api:${log4jVersion}") implementation("org.apache.logging.log4j:log4j-1.2-api:${log4jVersion}") include(implementation("org.apache.commons:commons-lang3:3.12.0")) + + modImplementation "ModMenu:modmenu:2.0.2-7.1" } java { @@ -80,7 +116,7 @@ java { withSourcesJar() } -tasks.withType(JavaCompile) { +tasks.withType(JavaCompile).configureEach { options.release.set 8 } diff --git a/gradle.properties b/gradle.properties index 8b1c9e3..b6833be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx2G # BTA -bta_version=1.7.7.0_02 +bta_version=7.1-pre1 # Loader loader_version=0.14.19-babric.1-bta diff --git a/src/main/java/turniplabs/halplibe/util/TextureHandler.java b/src/main/java/turniplabs/halplibe/util/TextureHandler.java index 4a2ef7b..4bc59f1 100644 --- a/src/main/java/turniplabs/halplibe/util/TextureHandler.java +++ b/src/main/java/turniplabs/halplibe/util/TextureHandler.java @@ -69,7 +69,7 @@ public void update() { for (int i = 0; i < this.resolution * scale; ++i) { for (int j = 0; j < this.resolution * scale; ++j) { - transferPixel(this.frames, (int) (this.elapsedTicks * this.resolution * this.resolution * scale * scale + j * this.resolution * scale + i), this.imageData, (int) (j * this.resolution * scale + i)); + //transferPixel(this.frames, (int) (this.elapsedTicks * this.resolution * this.resolution * scale * scale + j * this.resolution * scale + i), this.imageData, (int) (j * this.resolution * scale + i)); } }