Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
c47edf1
追加 : 布などの加工品
shift02 Oct 26, 2014
641bf6f
追加 : 製材機
shift02 Oct 26, 2014
5d1e4dd
修正 : バージョン表記
shift02 Oct 26, 2014
a2c5283
Merge branch 'release/2.0.6'
shift02 Oct 26, 2014
38f07bb
Merge branch 'master' into develop
shift02 Oct 26, 2014
252a1aa
追加 : ラージ鉱石が生成されるように
shift02 Oct 26, 2014
93a1ebf
修正 : gearboxが正しく出力できない問題
shift02 Oct 26, 2014
a9a0dca
修正 : バージョン表記
shift02 Oct 26, 2014
246a2b3
Merge branch 'hotfix/gearbox'
shift02 Oct 26, 2014
20ca6c3
Merge branch 'master' into develop
shift02 Oct 26, 2014
d1f0c5b
追加 : GF変換器の描写
shift02 Oct 27, 2014
115fbd2
追加 : GearShaft
shift02 Oct 30, 2014
f38d405
修正 : バニラの水入り瓶
shift02 Oct 30, 2014
e40f166
追加 : Fluidかまど
shift02 Oct 31, 2014
bef89d8
追加 : ブロックボトル
shift02 Nov 1, 2014
323cfc0
修正 : ボトルブロック
shift02 Nov 2, 2014
b259424
追加 : 匠茶
shift02 Nov 2, 2014
79a3037
追加 : BlockBottleを飲んだ時の効果
shift02 Nov 3, 2014
47342ca
追加 : 液体かまどをNEIに対応
shift02 Nov 3, 2014
7c7346e
追加 : 液体クリスタル
shift02 Nov 4, 2014
d018469
追加 : 液体コンテナ
shift02 Nov 5, 2014
ccd673d
追加 : 液体かまどの排出機能
shift02 Nov 7, 2014
8eee58d
修正 : バージョン表記
shift02 Nov 7, 2014
de32e91
修正 : GUIのローカライズ
shift02 Nov 7, 2014
786e8de
修正 : 液体Listの最後
shift02 Nov 7, 2014
37ee6fe
Merge branch 'release/2.0.7'
shift02 Nov 7, 2014
68f2213
Merge branch 'master' into develop
shift02 Nov 7, 2014
0242e50
修正 : レシピのnull
shift02 Nov 9, 2014
a2a0124
修正 : バージョン表記
shift02 Nov 9, 2014
0aee705
Merge branch 'master' into develop
shift02 Nov 9, 2014
557d26b
追加 : ファンタジー金属
shift02 Nov 11, 2014
6b61c88
追加 : Magicカマド
shift02 Nov 13, 2014
385a374
追加 : 魔法のカマドのレシピ
shift02 Nov 14, 2014
d70f99d
追加 : プレイヤーインベントリを拡張
shift02 Nov 16, 2014
6949e48
追加 : 追加装備
shift02 Nov 18, 2014
5fdf8a4
追加 : Tabシステム
shift02 Nov 19, 2014
2a21e91
追加 : 装備スロット
shift02 Nov 22, 2014
a5d0381
追加 : クラフトUnit
shift02 Nov 22, 2014
3f8ad7f
追加 : 匠ShopにクラフトUnit
shift02 Nov 22, 2014
986428e
修正 : バージョン表記
shift02 Nov 22, 2014
6e093ec
Merge branch 'release/2.0.8'
shift02 Nov 22, 2014
8b0b633
Merge branch 'master' into develop
shift02 Nov 22, 2014
64a2d56
追加 : ナイフ
shift02 Nov 24, 2014
32a889f
追加 : ウッドホッパー
shift02 Nov 30, 2014
ef199f2
修正 : プラグインシステム
shift02 Dec 1, 2014
4fbb596
追加 : ナイフとクリーパを倒すと頭をドロップ
shift02 Dec 5, 2014
cc63fae
追加 : 水車
shift02 Dec 6, 2014
f47e504
追加 : Steel(Power 3)の機械
shift02 Dec 7, 2014
65ab307
追加 : バージョン表記
shift02 Dec 7, 2014
5e7e48e
Merge branch 'release/2.0.9'
shift02 Dec 7, 2014
c0d7d5c
Merge branch 'master' into develop
shift02 Dec 7, 2014
800c758
追加 : 電気モーター
shift02 Dec 9, 2014
5a91e19
追加 : 鉱石の粉砕レシピ
shift02 Dec 11, 2014
4b5ea16
追加 : 燻製器
shift02 Dec 13, 2014
b24fd84
追加 : ファン
shift02 Dec 17, 2014
f8ca211
追加 : クリーパーリング
shift02 Dec 19, 2014
2627cfb
追加 : 機械のレシピ
shift02 Dec 23, 2014
61622c2
追加 : GFコンタクトレンズ
shift02 Dec 23, 2014
60f1716
追加 : GFコンタクトレンズをShopの商品に
shift02 Dec 23, 2014
0ea8593
修正 : バージョン表記
shift02 Dec 23, 2014
f608722
修正 : 石炭のドロップ
shift02 Dec 23, 2014
577a470
Merge branch 'release/2.1.0'
shift02 Dec 23, 2014
d225535
Merge branch 'master' into develop
shift02 Dec 23, 2014
1e80690
Create fr_FR.lang
Mazdallier Dec 23, 2014
93e05a4
追加 : 料理
shift02 Dec 27, 2014
7a2520e
修正 : 砂場の生成される頻度
shift02 Dec 28, 2014
16ea166
修正 : 米の画像
shift02 Dec 28, 2014
41a0199
修正 : バージョン表記
shift02 Dec 28, 2014
ac6f2eb
追加 : 実績
shift02 Jan 5, 2015
25ed57c
Merge commit '41a0199e1d2becc5fd50b370a13bd22c46525389'
shift02 Jan 5, 2015
cbb7282
Merge branch 'release/2.1.1' into develop
shift02 Jan 5, 2015
a907f8b
Merge branch 'develop'
shift02 Jan 5, 2015
74a0c70
Merge pull request #1 from Mazdallier/patch-1
shift02 Jan 5, 2015
604c83e
Merge branch 'master' of github.com:shift02/SextiarySector2
shift02 Jan 5, 2015
40b1f1c
修正 : IFarmlandを使うように
shift02 Jan 5, 2015
a983673
Merge branch 'master' into develop
shift02 Jan 5, 2015
ad7dcd6
修正 : 作物関係
shift02 Jan 6, 2015
832a4a9
修正 : バージョン表示
shift02 Jan 6, 2015
ab62a53
Merge branch 'develop'
shift02 Jan 6, 2015
26fff84
追加 : Power 5
shift02 Jan 12, 2015
3e46f1e
追加 : 枡
shift02 Jan 17, 2015
d695977
追加 : フリーザー
shift02 Jan 21, 2015
9ba7cc7
追加 : 液体かまどのレシピ
shift02 Jan 25, 2015
67c5f28
Merge branch 'develop'
shift02 Jan 25, 2015
accae48
修正 マルチで起動
shift02 Jan 27, 2015
95deb6a
修正 : マルチでのベットバグ
shift02 Jan 28, 2015
18c87d1
追加 : 蒸気モーター
shift02 Feb 10, 2015
276976a
追加 : キノコ栽培
shift02 Feb 11, 2015
0f94f80
Merge branch 'develop'
shift02 Feb 11, 2015
a74da1d
追加 : 鉄パイプ
shift02 Feb 21, 2015
33a0b10
Merge branch 'develop'
shift02 Feb 21, 2015
68f4cf0
追加 : 漏斗
shift02 Mar 3, 2015
01790e4
修正 : 耕地
shift02 Mar 3, 2015
184681e
修正 : マルチ関係
shift02 Mar 5, 2015
5194ebb
Merge branch 'develop'
shift02 Mar 5, 2015
88b0ef8
追加 : 椎茸
shift02 Mar 12, 2015
0edde20
追加 : FMPに対応
shift02 Mar 16, 2015
fc3a93f
Merge branch 'develop'
shift02 Mar 16, 2015
964cdde
追加 : ブルーストーンジェル
shift02 Mar 23, 2015
ba685bf
修正 : 銅鉱石の大きな
shift02 Mar 24, 2015
70c3eca
Merge branch 'develop'
shift02 Mar 24, 2015
224af17
追加 : 大きな風車
shift02 Apr 1, 2015
570495d
Merge branch 'develop'
shift02 Apr 1, 2015
7eae56b
追加 : Spray
shift02 Apr 26, 2015
10511bd
修正 : ブロックの硬さ
shift02 May 3, 2015
cff2e73
Merge branch 'develop'
shift02 May 3, 2015
4e6d45f
追加 : よりマイクラらしく
shift02 Jun 14, 2015
c462149
修正 : テクスチャとか
shift02 Jul 18, 2015
4de0850
Merge branch 'develop'
shift02 Jul 18, 2015
08ec771
Create zh_CN.lang
Jul 20, 2015
678e467
Merge pull request #4 from TunkShif/patch-1
shift02 Jul 22, 2015
c533348
修正 : 出荷箱を破壊できるように
shift02 Jul 25, 2015
923d521
Merge branch 'develop'
shift02 Jul 25, 2015
848a8e2
Merge branch 'master' into develop
shift02 Jul 25, 2015
21e16ad
修正:テクスチャの指定ミス
shift02 Jul 26, 2015
1bff55d
Update zh_CN.lang
Jul 29, 2015
2094d10
追加:銀の粉
shift02 Jul 29, 2015
5bdfbb4
追加:金属プレート
shift02 Aug 13, 2015
c4ffc33
追加:葉っぱベッド
shift02 Aug 15, 2015
103d53e
Merge pull request #5 from TunkShif/patch-2
shift02 Aug 15, 2015
bbfcea9
Merge branch 'master' into develop
shift02 Aug 15, 2015
4fed041
変更:バニラのボトルを使うように変更
shift02 Aug 25, 2015
4c8760f
追加:空腹値の動作を分離
shift02 Aug 25, 2015
78680d6
追加:葉っぱが早く消滅する
shift02 Aug 28, 2015
da4e7e9
追加:黒曜石のLangデータ
shift02 Aug 28, 2015
9782a14
Merge branch 'develop'
shift02 Aug 28, 2015
874e6c0
更新:Forgeのバージョンを1448に
shift02 Sep 4, 2015
413f57e
修正:masterプロジェクトが無くても起動するように
shift02 Sep 4, 2015
b54c244
Merge branch 'develop'
shift02 Sep 4, 2015
fcf7565
fix ItemFoodDrink
flammpfeil Oct 8, 2015
bed4623
Update zh_CN.lang
jiuyaolx Oct 9, 2015
13fe190
Merge pull request #6 from flammpfeil/patch-1
shift02 Oct 10, 2015
1884478
Merge pull request #8 from jiuyaolx/master
shift02 Oct 26, 2015
6a627bb
Update ja_JP.lang
libertyCrown Nov 22, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,16 @@
/api
/build
/src/api
/src/main/java/tconstruct
/*.exe
/*.classpath
/*.project
*.xcf
*.xcf
/eclipse
.settings/org.eclipse.jdt.core.prefs
CREDITS-fml.txt
LICENSE-fml.txt
MinecraftForge-Credits.txt
MinecraftForge-License.txt
README.txt
forge-1.7.10-10.13.4.1448-1.7.10-changelog.txt
2 changes: 2 additions & 0 deletions build.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
call gradlew.bat build
pause
73 changes: 49 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,57 +1,82 @@
sourceSets.main {
java.srcDirs project.projectDir.name
resources.srcDirs project.projectDir.name
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
}
}

version = "2.0.5.a-${project.minecraft.version}"

apply plugin: 'forge'

version = "2.4.3.d-1.7.10"//${project.minecraft.version}"
group= "shift.SextiarySector2" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "SextiarySector2"

minecraft {
// replacing stuff in the source
version = "1.7.10-10.13.4.1448-1.7.10"
runDir = "eclipse"
assetDir = "eclipse/assets"

replace '@VERSION@', project.version
replace '@MC_VERSION@', version
}

dependencies {
compile project(':MCEconomy2')
compile fileTree(dir: 'api', include: '*.jar')
[compileJava, compileTestJava,recompMinecraft].each{
it.options.encoding = 'UTF-8'
it.options.compilerArgs += ['-source', '1.7', '-target', '1.7']
}

//�R���p�C�����̕����R�[�h�w���Java�̃o�[�W�����w��B���̏�������Ȃ���gradle2.0�ł͓����Ȃ��B
[compileJava, compileTestJava,recompMinecraft, makeStart].each{
it.options.encoding = 'UTF-8'
it.options.compilerArgs += ['-source', '1.7', '-target', '1.7']
}
dependencies {
compile fileTree(dir: 'api', include: '*.jar')
}

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

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'

// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}

// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}

//from(sourceSets.main.java.srcDirs+'/shift/sextiarysector/api/') {
//include '**/shift/sextiarysector/api/'

// into sourceSets.main.java.srcDirs
//}

}

jar {

into('src/shift/sextiarysector/api') {
from 'src/main/java/shift/sextiarysector/api'
}

manifest {
attributes 'FMLCorePlugin' : 'shift.sextiarysector.asm.SSCore','FMLCorePluginContainsFMLMod':'true'
}

}

task devJar(type: Jar) {
from sourceSets.main.output
from sourceSets.main.allSource
classifier = 'dev'
}

artifacts {
archives devJar
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Wed Jul 02 15:54:47 CDT 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
164 changes: 164 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
#!/usr/bin/env bash

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
echo "$*"
}

die ( ) {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
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"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
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=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
90 changes: 90 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windowz variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*
goto execute

:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
3 changes: 3 additions & 0 deletions setup.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
call gradlew.bat setupDevWorkspace
call gradlew.bat eclipse
pause
Loading