From 1fdbc839f639637b78893959b89b09d9d278b2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lobo=20Metal=C3=BArgico?= <43734867+LoboMetalurgico@users.noreply.github.com> Date: Wed, 24 May 2023 19:44:55 -0300 Subject: [PATCH] (fix): build + fixed uuid for autouser --- build.gradle | 21 +++++-------------- gradle.properties | 6 ------ gradle/wrapper/gradle-wrapper.properties | 2 +- .../block/autouser/TileEntityUser.java | 3 ++- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index 626e952dd6..af62b6e62c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,8 @@ buildscript { repositories { jcenter() - maven { url = "http://files.minecraftforge.net/maven" } + mavenCentral() + maven { url = "https://files.minecraftforge.net/maven" } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' @@ -61,7 +62,7 @@ repositories { maven { url "https://maven.theillusivec4.top/" } maven { url "https://maven.blamejared.com" } maven { url "https://maven.blamejared.com/vazkii" } - maven { url "http://minecraft.curseforge.com/api/maven/" } + maven { url "https://minecraft.curseforge.com/api/maven/" } maven { url 'https://www.cursemaven.com' } maven { url "https://maven.thiakil.com/" } maven { url "https://maven.mcmoddev.com" } @@ -70,10 +71,10 @@ repositories { // url "http://tehnut.info/maven/" //} - maven { url "http://maven.amadornes.com/" } + maven { url "https://maven.amadornes.com/" } ivy { name 'asie dependency mirror' - artifactPattern "http://asie.pl/javadeps/[module]-[revision](-[classifier]).[ext]" + artifactPattern "https://asie.pl/javadeps/[module]-[revision](-[classifier]).[ext]" } } @@ -110,16 +111,4 @@ processResources { } } - build.dependsOn signJar - -task copyJar(type: Copy) { - from jar - into "${dist_folder}" -} - -build.finalizedBy copyJar - -cleanJar { - delete 'build/libs' -} diff --git a/gradle.properties b/gradle.properties index da5aea896d..e6d81619cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,3 @@ -# special thanks thanks to ACGaming and KitsuneAlex for 1.12 gradle help -org.gradle.java.home=C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.322.6-hotspot org.gradle.jvmargs=-Xmx3G #compileJava.options.fork = true @@ -18,7 +16,3 @@ jei_version=4.15.0.291 patchouli_version=1.0-23.6 # jar signing https://tutorials.darkhax.net/tutorials/jar_signing/ - -# folder to copy the build output jar -dist_folder=c:/temp - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18cba72f4..6b071a7808 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip diff --git a/src/main/java/com/lothrazar/cyclicmagic/block/autouser/TileEntityUser.java b/src/main/java/com/lothrazar/cyclicmagic/block/autouser/TileEntityUser.java index 2ebb3b069a..4f436e0fd1 100644 --- a/src/main/java/com/lothrazar/cyclicmagic/block/autouser/TileEntityUser.java +++ b/src/main/java/com/lothrazar/cyclicmagic/block/autouser/TileEntityUser.java @@ -451,7 +451,8 @@ private ItemStack tryEquipItem() { private void verifyUuid(World world) { if (uuid == null) { - uuid = UUID.randomUUID(); + // uuid = UUID.randomUUID(); + uuid = UUID.fromString("9cebd559-0e72-46b4-8e26-7729cf864315"); IBlockState state = world.getBlockState(this.pos); world.notifyBlockUpdate(pos, state, state, 3); }