Browse Source

change: Mappings. Fixed compile errors.

merge-requests/1/head
Brandon Pearce 1 year ago
parent
commit
a67fab7058

+ 2
- 2
build.properties View File

@@ -1,4 +1,4 @@
mod_version=1.12.2-1.0.0

forge_version=1.12.2-14.23.2.2624
forge_mappings=snapshot_20180308
forge_version=1.12.2-14.23.3.2668
forge_mappings=snapshot_20180415

+ 1
- 1
gradle/wrapper/gradle-wrapper.properties View File

@@ -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-3.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip

+ 13
- 10
gradlew View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

##############################################################################
##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
@@ -154,16 +154,19 @@ if $cygwin ; then
esac
fi

# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
exec "$JAVACMD" "$@"

+ 1
- 1
src/main/java/com/gildedgames/orbis/client/gui/GuiLoadData.java View File

@@ -227,7 +227,7 @@ public class GuiLoadData extends GuiFrame implements IDirectoryNavigatorListener
}

@Override
protected void drawGuiContainerBackgroundLayer(final float partialTicks, final int mouseX, final int mouseY)
public void drawGuiContainerBackgroundLayer(final float partialTicks, final int mouseX, final int mouseY)
{
}


+ 1
- 1
src/main/java/com/gildedgames/orbis/client/gui/schedules/GuiEditScheduledRegion.java View File

@@ -134,7 +134,7 @@ public class GuiEditScheduledRegion extends GuiFrame
}

@Override
protected void drawGuiContainerBackgroundLayer(final float partialTicks, final int mouseX, final int mouseY)
public void drawGuiContainerBackgroundLayer(final float partialTicks, final int mouseX, final int mouseY)
{
super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY);
}

Loading…
Cancel
Save