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.

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

Betterify transforms for Energy Collector and Lens + update gradle wrapper #279

Open
wants to merge 2 commits into
base: 1.12
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ dependencies {
deobfCompile "com.github.mcjty:intwheel:${intwheel_version}"
if (!project.hasProperty("singleproject")) {
deobfCompile "com.github.mcjty:mcjtylib:${mcjtylib_version}"
deobfCompile "com.github.mcjty:xnet:1.12-1.7.0"
deobfCompile "com.github.mcjty:rftools:1.12-7.58"
deobfCompile "com.github.mcjty:xnet:1.12-1.8.0"
deobfCompile "com.github.mcjty:rftools:1.12-7.70"
} else {
compile project(':McJtyLib')
compile project(':XNet')
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ github_project=McJtyMods/DeepResonance

minecraft_version=1.12.2
mcp_mappings=snapshot_20180504
forge_version=14.23.4.2750
forge_version=14.23.5.2837

jei_version=1.12.2:4.8.5.159
waila_version=1.8.23-B38_1.12
top_version=1.12:1.12-1.4.20-12
mcjtylib_version=1.12-3.5.0
mcjtylib_version=1.12-3.5.2
redstoneflux_version=1.12-2.0.0.1:universal
tesla_version=1.12.2:1.0.63
intwheel_version=1.12-1.2.7
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Jan 26 11:00:44 CET 2019
#Sat May 11 11:44:06 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
6 changes: 1 addition & 5 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ case "`uname`" in
;;
esac

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
Expand Down Expand Up @@ -114,6 +109,7 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,37 @@
},
"variants": {
"normal": [{}],
"inventory": [{}]
"inventory": [{
"transform": {
"gui": {
"rotation": [ 30, 225, 0 ],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
"rotation": [ 75, 45, 0 ],
"scale": [ 0.375, 0.375, 0.375 ]
},
"thirdperson_lefthand": {
"rotation": [ 75, 225, 0 ],
"scale": [ 0.375, 0.375, 0.375 ]
},
"firstperson_righthand": {
"rotation": [ 0, 45, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
},
"firstperson_lefthand": {
"rotation": [ 0, 225, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
}
}]
}
}
34 changes: 33 additions & 1 deletion src/main/resources/assets/deepresonance/blockstates/lens.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,39 @@
},
"variants": {
"normal": [{}],
"inventory": [{}],
"inventory": [{
"transform": {
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0.25 ],
"scale":[ 0.5, 0.5, 0.5 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"scale":[ 1, 1, 1 ]
},
"thirdperson_righthand": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0.175, 0.3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"thirdperson_lefthand": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0.175, 0.3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson_righthand": {
"rotation": [ 0, -90, 25 ],
"translation": [ -0.2825, 0.25, 0.1 ],
"scale": [ 0.64, 0.64, 0.64 ]
},
"firstperson_lefthand": {
"rotation": [ 0, -90, 25 ],
"translation": [ -0.2825, 0.25, 0.1 ],
"scale": [ 0.64, 0.64, 0.64 ]
}
}
}],
"facing": {
"north": {},
"south": {"y": 180},
Expand Down