Skip to content

Build scripts fixes, UTF-8 support, addons: world.getEntityTypes, world.getEntities, world.removeEntityType, entity.getEntities, entity.removeEntityType, partial RaspberryJam syntax compatibility #42

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

Open
Marcinosoft wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Build scripts fixes, UTF-8 support, addons: world.getEntityTypes, world.getEntities, world.removeEntityType, entity.getEntities, entity.removeEntityType, partial RaspberryJam syntax compatibility #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69cfdbf
Fixes build routines
Apr 15, 2019
c4835e1
Git ignore python-scripts.zip
Apr 15, 2019
909bf7c
Remove python-scripts.zip
Apr 15, 2019
6fbc806
Merge pull request #1 from arpruss/master
Marcinosoft Apr 15, 2019
d66878d
Make spawnEntity compatible both with RaspberryJamMod (type,x,y,z,tags)
Apr 15, 2019
978fa90
Merge branch 'master' of https://github.com/Marcinosoft/raspberryjamm…
Apr 15, 2019
79a028d
Build routine update
Apr 21, 2019
898ee5e
Build routine update
Apr 21, 2019
0f318f0
Build routine update
Apr 24, 2019
8cfe3c2
Added: UTF-8 support, world.getEntityTypes, world.getEntities,
Apr 24, 2019
468238f
removeEntityType returns int instead of str
May 17, 2019
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
8 changes: 8 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/.gradle
/.classpath
/.project
/.settings
/bin/
/build/
/python-scripts.zip
/.pydevproject
7 changes: 7 additions & 0 deletions 110/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/.gradle/
/build/
/src/
/bin/
/.classpath
/.settings/
/.project
10 changes: 8 additions & 2 deletions 110/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,22 @@ version = "0.94"
group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "RaspberryJamMod"

sourceCompatibility = targetCompatibility = "1.7" // Need this here so eclipse task generates correctly.
//compileJava.options.bootClasspath = "$JDK7_HOME/jre/lib/rt.jar"
compileJava {
sourceCompatibility = targetCompatibility = "1.7"
}

minecraft {
version = "1.10.2-12.18.2.2147"
version = "1.10.2-12.18.3.2511"
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 = "snapshot_20161116"
mappings = "snapshot_20161111"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

Expand Down
6 changes: 3 additions & 3 deletions 110/fast.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ cp build/libs/RaspberryJamMod.jar ../build/out/1.10/
cp build/libs/RaspberryJamMod.jar ../build/out/1.10.2/
if [ "$1" != "noinstall" ]
then
mkdir $APPDATA/.minecraft/mods
mkdir $APPDATA/.minecraft/mods/1.10
mkdir $APPDATA/.minecraft/mods/1.10.2
mkdir $APPDATA/.minecraft/mods 2> /dev/null
mkdir $APPDATA/.minecraft/mods/1.10 2> /dev/null
mkdir $APPDATA/.minecraft/mods/1.10.2 2> /dev/null
cp build/libs/RaspberryJamMod.jar $APPDATA/.minecraft/mods/1.10/
cp build/libs/RaspberryJamMod.jar $APPDATA/.minecraft/mods/1.10.2/
else
Expand Down
2 changes: 0 additions & 2 deletions 110/fix.sed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
s/Blocks\.air/Blocks.AIR/g
s/MobEffects\.levitation/MobEffects.LEVITATION/g
s/MobEffects\.nightVision/MobEffects.NIGHT_VISION/g
s/\.thePlayer/\.player/g
s/\.theWorld/\.world/g
s/\[1\.9,1\.9\.4)/[1.9.4,1.11)/
s/getUnformattedTextForChat/getUnformattedComponentText/g
s/NOMINAL_VERSION\s*=\s*1009000/NOMINAL_VERSION = 1010000/
1 change: 1 addition & 0 deletions 110/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
JDK7_HOME=c:/Program Files/Java/jdk1.7.0_80
7 changes: 7 additions & 0 deletions 111/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/.gradle/
/build/
/src/
/bin/
/.classpath
/.project
/.settings/
11 changes: 8 additions & 3 deletions 111/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,22 @@ version = "0.94"
group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "RaspberryJamMod"

sourceCompatibility = targetCompatibility = "1.7" // Need this here so eclipse task generates correctly.
//compileJava.options.bootClasspath = "$JDK7_HOME/jre/lib/rt.jar"
compileJava {
sourceCompatibility = targetCompatibility = "1.7"
}

minecraft {
version = "2151"
version = "1.11-13.19.1.2199"
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 = "snapshot_20161124"
mappings = "snapshot_20161208"
mappings = "snapshot_20161220"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

Expand Down
6 changes: 3 additions & 3 deletions 111/fast.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ cp build/libs/RaspberryJamMod.jar ../build/out/1.11/
cp build/libs/RaspberryJamMod.jar ../build/out/1.11.2/
if [ "$1" != "noinstall" ]
then
mkdir $APPDATA/.minecraft/mods
mkdir $APPDATA/.minecraft/mods/1.11
mkdir $APPDATA/.minecraft/mods/1.11.2
mkdir $APPDATA/.minecraft/mods 2> /dev/null
mkdir $APPDATA/.minecraft/mods/1.11 2> /dev/null
mkdir $APPDATA/.minecraft/mods/1.11.2 2> /dev/null
cp build/libs/RaspberryJamMod.jar $APPDATA/.minecraft/mods/1.11/
cp build/libs/RaspberryJamMod.jar $APPDATA/.minecraft/mods/1.11.2/
else
Expand Down
4 changes: 3 additions & 1 deletion 111/fix.sed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ s/spawnEntityInWorld/spawnEntity/g
s/createEntityByName/createEntityByIDFromName/g
s/worldServers/worlds/g
s/getUnformattedTextForChat/getUnformattedComponentText/g
s/getPlayerList()\.getPlayerList()/getPlayerList().getPlayers()/g
s/getPlayerList()\.getPlayerList()/getPlayerList().getPlayers()/g
s/getEntityID(e/getID(e.getClass()/g
s/for (String entityTypeName : EntityList.getEntityNameList()) { if (EntityList.getIDFromString(entityTypeName) >= 0) { bdr.append(EntityList.getIDFromString(entityTypeName)); bdr.append(","); bdr.append(entityTypeName); bdr.append("|"); }/for (ResourceLocation rl: EntityList.getEntityNameList()) { if (EntityList.getClass(rl) != null) { bdr.append(EntityList.getID(EntityList.getClass(rl))); bdr.append(","); bdr.append(rl.getResourcePath()); bdr.append("|"); }/g
1 change: 1 addition & 0 deletions 111/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
JDK7_HOME=c:/Program Files/Java/jdk1.7.0_80
7 changes: 7 additions & 0 deletions 112/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/.gradle/
/build/
/src/
/bin/
/.classpath
/.project
/.settings/
13 changes: 9 additions & 4 deletions 112/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
Expand All @@ -24,17 +24,22 @@ version = "0.94"
group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "RaspberryJamMod"

sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
//compileJava.options.bootClasspath = "$JDK8_HOME/jre/lib/rt.jar"
compileJava {
sourceCompatibility = targetCompatibility = '1.8'
}

minecraft {
version = "2151"
version = "1.12-14.21.1.2443"
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 = "snapshot_20161124"
mappings = "snapshot_20170613"
mappings = "snapshot_20170624"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

Expand Down
14 changes: 9 additions & 5 deletions 112/fast.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@ for x in src/main/java/mobi/omegacentauri/raspberryjammod/*.java ; do
sed -i -f fix.sed $x
done
rm build/libs/Raspberr*.jar 2> /dev/null
sh gradlew --offline build
sh gradlew build
# --offline build
rm build/libs/Raspberry*ources.jar 2> /dev/null
mv build/libs/Raspberr* build/libs/RaspberryJamMod.jar 2> /dev/null
mkdir ../build/out 2> /dev/null
mkdir ../build/out/1.12 2> /dev/null
mkdir ../build/out/1.12.1 2> /dev/null
mkdir ../build/out/1.12.2 2> /dev/null
cp build/libs/RaspberryJamMod.jar ../build/out/1.12/
cp build/libs/RaspberryJamMod.jar ../build/out/1.12.1/
cp build/libs/RaspberryJamMod.jar ../build/out/1.12.2/
if [ "$1" != "noinstall" ]
then
mkdir $APPDATA/.minecraft/mods
mkdir $APPDATA/.minecraft/mods/1.12
mkdir $APPDATA/.minecraft/mods/1.12.1
mkdir $APPDATA/.minecraft/mods/1.12.2
mkdir $APPDATA/.minecraft/mods 2> /dev/null
mkdir $APPDATA/.minecraft/mods/1.12 2> /dev/null
mkdir $APPDATA/.minecraft/mods/1.12.1 2> /dev/null
mkdir $APPDATA/.minecraft/mods/1.12.2 2> /dev/null
cp build/libs/RaspberryJamMod.jar $APPDATA/.minecraft/mods/1.12/
cp build/libs/RaspberryJamMod.jar $APPDATA/.minecraft/mods/1.12.1/
cp build/libs/RaspberryJamMod.jar $APPDATA/.minecraft/mods/1.12.2/
Expand Down
5 changes: 5 additions & 0 deletions 112/fix.sed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ s/\.xCoord/.x/g
s/\.yCoord/.y/g
s/\.zCoord/.z/g
s/worldServerForDimension/getWorld/g
s/getEntityID(e/getID(e.getClass()/g
s/import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry;//g
s/@Override public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {return null;}//g
s/@Override public Class<? extends GuiScreen> mainConfigGuiClass() {return Gui.class;}//g
s/for (String entityTypeName : EntityList.getEntityNameList()) { if (EntityList.getIDFromString(entityTypeName) >= 0) { bdr.append(EntityList.getIDFromString(entityTypeName)); bdr.append(","); bdr.append(entityTypeName); bdr.append("|"); }/for (ResourceLocation rl: EntityList.getEntityNameList()) { if (EntityList.getClass(rl) != null) { bdr.append(EntityList.getID(EntityList.getClass(rl))); bdr.append(","); bdr.append(rl.getResourcePath()); bdr.append("|"); }/g
1 change: 1 addition & 0 deletions 112/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
JDK8_HOME=c:/Program Files/Java/jdk1.8.0_202
6 changes: 6 additions & 0 deletions 19/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/.gradle/
/.classpath
/.project
/.settings/
/bin/
/build/
6 changes: 6 additions & 0 deletions 19/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ version = "0.94"
group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "RaspberryJamMod"

sourceCompatibility = targetCompatibility = "1.7" // Need this here so eclipse task generates correctly.
//compileJava.options.bootClasspath = "$JDK7_HOME/jre/lib/rt.jar"
compileJava {
sourceCompatibility = targetCompatibility = "1.7"
}

minecraft {
version = "1.9-12.16.0.1864-1.9"
runDir = "run"
Expand Down
1 change: 1 addition & 0 deletions 19/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
JDK7_HOME=c:/Program Files/Java/jdk1.7.0_80
Loading