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

[1.12.2] Fix build and set a fixed UUID for AutoUser #2304

Open
wants to merge 2 commits into
base: trunk/1.12
Choose a base branch
from
+5 −8
Open

[1.12.2] Fix build and set a fixed UUID for AutoUser #2304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fdbc83
(fix): build + fixed uuid for autouser
LoboMetalurgico May 24, 2023
3023681
Merge remote-tracking branch 'upstream/trunk/1.12' into trunk/1.12
LoboMetalurgico Jul 24, 2023
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
6 changes: 2 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
repositories {
jcenter()
mavenCentral()
mavenCentral()
maven { url = "https://files.minecraftforge.net/maven" }
}
dependencies {
Expand Down Expand Up @@ -106,6 +106,4 @@ processResources {
}
}

task cleanJar {
delete 'build/libs'
}
build.dependsOn signJar
4 changes: 1 addition & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# special thanks thanks to ACGaming and KitsuneAlex for 1.12 gradle help. use the override below with your path, only if needed with your IDE (old eclipse versions)
# special thanks thanks to ACGaming and KitsuneAlex for 1.12 gradle help. use the override below with your path, only if needed with your IDE (really old eclipse versions)
#org.gradle.java.home=C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.322.6-hotspot
org.gradle.jvmargs=-Xmx3G
#compileJava.options.fork = true
Expand All @@ -18,5 +18,3 @@ jei_version=4.15.0.291
patchouli_version=1.0-23.6

# jar signing https://tutorials.darkhax.net/tutorials/jar_signing/


3 changes: 2 additions & 1 deletion src/main/java/com/lothrazar/cyclicmagic/block/autouser/TileEntityUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down