Skip to content

Commit

Permalink
migrated to 1.12.2
Browse files Browse the repository at this point in the history
  • Loading branch information
raik0707 committed Nov 21, 2020
1 parent 4b08a13 commit c1dd0fd
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
20 changes: 11 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@

// For those who want the bleeding edge
buildscript {
repositories {
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven { url = "http://files.minecraftforge.net/maven" }
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
Expand All @@ -21,19 +16,26 @@ compileJava.options.encoding = "UTF-8"
sourceCompatibility = 1.8
targetCompatibility = 1.8


minecraft {
version = "1.8.9-11.15.1.1855"
version = "1.12.2-14.23.0.2512"
runDir = "run"

// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "stable_20"
mappings = "snapshot_20171003"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

processResources {
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
}

reobf {
jar {
useNotchSrg()
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
Binary file renamed libs/lm_api_mc1.8.9.jar → libs/lm_api_mc1.12.2.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions src/main/java/de/raik/tnttimer/ExplosionTimeRenderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void onRender(Entity entity, double x, double y, double z, float partialT
EntityTNTPrimed tntEntity = (EntityTNTPrimed) entity;

//Check distance
if (tntEntity.getDistanceSqToEntity(this.renderManager.livingPlayer) > (double) (64 * 64))
if (tntEntity.getDistanceSq(this.renderManager.renderViewEntity) > (double) (64 * 64))
return;

//Render
Expand All @@ -78,7 +78,7 @@ public void onRender(Entity entity, double x, double y, double z, float partialT
* @return The tag
*/
private String getTagString(EntityTNTPrimed tntEntity, float partialTicks) {
float number = (tntEntity.fuse - partialTicks) / 20F;
float number = (tntEntity.getFuse() - partialTicks) / 20F;

if (number < 0)
return null;
Expand All @@ -100,7 +100,7 @@ private Color getColor(EntityTNTPrimed tntEntity) {
/*
* Snippet from Sk1ers Code
*/
float green = Math.min(tntEntity.fuse / 80F, 1F);
float green = Math.min(tntEntity.getFuse() / 80F, 1F);
return new Color(1F- green, green, 0F);
}

Expand Down

0 comments on commit c1dd0fd

Please sign in to comment.