Skip to content

Commit

Permalink
Merge branch 'main' of github.com:openpatch/scratch-for-java
Browse files Browse the repository at this point in the history
  • Loading branch information
mikebarkmin committed Jan 24, 2025
2 parents 26130e1 + fa82a6f commit 7536489
Show file tree
Hide file tree
Showing 7 changed files with 230 additions and 315 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/javadoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
- name: Build with Maven
run: ant -f resources/build.xml
- name: Setup Pages
Expand All @@ -35,4 +35,4 @@ jobs:
path: distribution/javadoc
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@v4
9 changes: 5 additions & 4 deletions examples/java/Tiled/World.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ public void loadMap(String mapFile) {
}
} else if ("enemy".equals(object.type)) {
switch (object.name) {
case "bamboo": {
this.add(new Bamboo(object.x, object.y));
break;
}
case "bamboo":
{
this.add(new Bamboo(object.x, object.y));
break;
}
}
}
}
Expand Down
Loading

0 comments on commit 7536489

Please sign in to comment.