Compare commits
4 Commits
ios-suppor
...
6049239303
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6049239303 | ||
|
|
55d06f0590 | ||
|
|
58b7724ba2 | ||
| 6ae787b90d |
31
.github/workflows/build.yml
vendored
31
.github/workflows/build.yml
vendored
@@ -216,16 +216,6 @@ jobs:
|
|||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 25
|
java-version: 25
|
||||||
|
|
||||||
- name: Validate environment
|
|
||||||
run: |
|
|
||||||
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
|
|
||||||
echo "ANDROID_NDK_PATH=$ANDROID_NDK_PATH"
|
|
||||||
echo "JAVA_HOME=$JAVA_HOME"
|
|
||||||
echo "MATRIX_ABI=$MATRIX_ABI"
|
|
||||||
$ANDROID_SDK_ROOT/platform-tools/adb version || true
|
|
||||||
java -version
|
|
||||||
javac -version
|
|
||||||
|
|
||||||
- name: Run Android build script
|
- name: Run Android build script
|
||||||
run: |
|
run: |
|
||||||
chmod +x ./build.sh
|
chmod +x ./build.sh
|
||||||
@@ -322,17 +312,10 @@ jobs:
|
|||||||
files: mcpe-linux/MinecraftPE-server
|
files: mcpe-linux/MinecraftPE-server
|
||||||
dest: minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
|
dest: minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
|
||||||
|
|
||||||
- name: Zip Android arm64-v8a Artifact
|
- name: Rename Android Artifacts
|
||||||
uses: vimtor/action-zip@v1.2
|
run: |
|
||||||
with:
|
mv minecraftpe-apk-arm64-v8a/minecraftpe-v8a-debug.apk minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.apk
|
||||||
files: minecraftpe-apk-arm64-v8a/minecraftpe-v8a-debug.apk
|
mv minecraftpe-apk-armeabi-v7a/minecraftpe-v7a-debug.apk minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.apk
|
||||||
dest: minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
|
|
||||||
|
|
||||||
- name: Zip Android armeabi-v7a Artifact
|
|
||||||
uses: vimtor/action-zip@v1.2
|
|
||||||
with:
|
|
||||||
files: minecraftpe-apk-armeabi-v7a/minecraftpe-v7a-debug.apk
|
|
||||||
dest: minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
|
|
||||||
|
|
||||||
- name: Zip Web Artifact
|
- name: Zip Web Artifact
|
||||||
uses: vimtor/action-zip@v1.2
|
uses: vimtor/action-zip@v1.2
|
||||||
@@ -358,9 +341,9 @@ jobs:
|
|||||||
MinecraftPE development release for commit ${{ github.sha }}.
|
MinecraftPE development release for commit ${{ github.sha }}.
|
||||||
files: |
|
files: |
|
||||||
./data.zip
|
./data.zip
|
||||||
|
./minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
|
||||||
./minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
|
./minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
|
||||||
./minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
|
./minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
|
||||||
./minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
|
./minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.apk
|
||||||
./minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
|
./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.apk
|
||||||
./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
|
|
||||||
./minecraftpe-${{ steps.ref.outputs.hash }}-web.zip
|
./minecraftpe-${{ steps.ref.outputs.hash }}-web.zip
|
||||||
|
|||||||
@@ -1035,7 +1035,10 @@ void Gui::renderChatMessages( const int screenHeight, unsigned int max, bool isC
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
|
void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
|
||||||
glColor4f2(1, 1, 1, .5);
|
glColor4f2(1, 1, 1, 1);
|
||||||
|
glEnable(GL_BLEND);
|
||||||
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
|
||||||
minecraft->textures->loadAndBindTexture("gui/gui.png");
|
minecraft->textures->loadAndBindTexture("gui/gui.png");
|
||||||
|
|
||||||
Inventory* inventory = minecraft->player->inventory;
|
Inventory* inventory = minecraft->player->inventory;
|
||||||
|
|||||||
@@ -131,6 +131,10 @@ public:
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int getRenderLayer() {
|
||||||
|
return Tile::RENDERLAYER_ALPHATEST;
|
||||||
|
}
|
||||||
|
|
||||||
bool canBurn(LevelSource* level, int x, int y, int z) {
|
bool canBurn(LevelSource* level, int x, int y, int z) {
|
||||||
return flameOdds[level->getTile(x, y, z)] > 0;
|
return flameOdds[level->getTile(x, y, z)] > 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user