Skip to content

Commit

Permalink
Merge pull request #21 from KoutaChan/3.x
Browse files Browse the repository at this point in the history
Added 10 new rooms and GitHub Workflow, few changes
  • Loading branch information
Quantizr authored Sep 16, 2023
2 parents f3a187c + 9d11e41 commit 1f4c4e0
Show file tree
Hide file tree
Showing 16 changed files with 3,351 additions and 2 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle

name: Java CI with Gradle

on:
push:
branches: [ "3.x" ]
pull_request:
branches: [ "3.x" ]

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'adopt'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
- name: Upload build artifact
uses: actions/[email protected]
with:
path: build/libs/*
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
}
apply plugin: 'net.minecraftforge.gradle.forge'

version = "3.3.2"
version = "3.4.0"
group= "io.github.quantizr.DungeonRooms" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "Dungeon_Rooms"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
public class DungeonRooms
{
public static final String MODID = "dungeonrooms";
public static final String VERSION = "3.3.2";
public static final String VERSION = "3.4.0";

Minecraft mc = Minecraft.getMinecraft();
public static Logger logger;
Expand Down
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

630 changes: 630 additions & 0 deletions src/main/resources/assets/dungeonrooms/catacombs/1x3/Slime-5.skeleton

Large diffs are not rendered by default.

956 changes: 956 additions & 0 deletions src/main/resources/assets/dungeonrooms/catacombs/1x4/Sewer-7.skeleton

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file not shown.
54 changes: 54 additions & 0 deletions src/main/resources/assets/dungeonrooms/dungeonrooms.json
Original file line number Diff line number Diff line change
Expand Up @@ -886,5 +886,59 @@
"fairysoul": false,
"dsg": "/channels/727426780381577291/732154637506969650/733875583536201820",
"sbp": "spider"
},
"Redstone-Skull-3": {
"category": "1x1",
"secrets": 3,
"fairysoul": false,
"sbp": "redstone-skull"
},
"Sewer-7": {
"category": "1x4",
"secrets": 7,
"fairysoul": false,
"sbp": "sewer"
},
"Altar-6": {
"category": "L-shape",
"secrets": 6,
"fairysoul": false,
"sbp": "altar"
},
"Slime-5": {
"category": "1x3",
"secrets": 5,
"fairysoul": false,
"sbp": "slime"
},
"Crypts-1": {
"category": "1x1",
"secrets": 1,
"fairysoul": false,
"sbp": "crypts"
},
"Draw-Bridge-6": {
"category": "1x1",
"secrets": 6,
"fairysoul": false,
"sbp": "draw-bridge"
},
"Double-Stair-3": {
"category": "1x1",
"secrets": 3,
"fairysoul": false,
"sbp": "double-stair"
},
"Lava-Skulls-3": {
"category": "1x1",
"secrets": 3,
"fairysoul": false,
"sbp": "lava-skulls"
},
"Four-Banner-1": {
"category": "1x1",
"secrets": 1,
"fairysoul": false,
"sbp": "four-banner"
}
}
Loading

0 comments on commit 1f4c4e0

Please sign in to comment.