Skip to content

Commit

Permalink
Merge pull request #68 from Limaru-Minecraft/alpha
Browse files Browse the repository at this point in the history
Alpha
  • Loading branch information
Mineshafter61 authored Jan 10, 2025
2 parents 3e5f03c + 3d9a7d2 commit 3fb17e2
Show file tree
Hide file tree
Showing 42 changed files with 1,878 additions and 1,662 deletions.
18 changes: 18 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="bin/main" path="src/main/java">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/main" path="src/main/resources">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
38 changes: 19 additions & 19 deletions .github/gradle_build_temp_storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 17
- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build --stacktrace
- name: Upload artifacts to Github Actions
uses: actions/upload-artifact@v2
with:
name: Artifacts
path: build/libs
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 17
- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build --stacktrace
- name: Upload artifacts to Github Actions
uses: actions/upload-artifact@v2
with:
name: Artifacts
path: build/libs
10 changes: 5 additions & 5 deletions .github/workflows/gradle_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 16
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 16
java-version: 17
- name: Cache Gradle packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Build with Gradle
run: ./gradlew build --stacktrace
- name: Upload artifacts to Github Actions
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Artifacts
path: build/libs
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ out/production/resources/lang.yml
out/production/resources/owners.yml
out/production/resources/plugin.yml
out/production/resources/records.yml
.idea/workspace.xml
.idea/workspace.xml
3 changes: 1 addition & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

89 changes: 45 additions & 44 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Iciwi</name>
<comment>Project iciwi created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
<filteredResources>
<filter>
<id>1727398145891</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
7 changes: 0 additions & 7 deletions .vscode/settings.json

This file was deleted.

26 changes: 0 additions & 26 deletions .vscode/tasks.json

This file was deleted.

10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1'
id "com.gradleup.shadow" version "9.0.0-beta4"
}

group 'mikeshafter'
version '2.20.301'
version '2.20.4'

compileJava.options.encoding 'UTF-8'

repositories {
maven { url 'https://papermc.io/repo/repository/maven-public/' }
maven { url 'https://repo.papermc.io/repository/maven-public/' }
maven { url 'https://ci.mg-dev.eu/plugin/repository/everything' }
maven { url 'https://jitpack.io' }
maven { url 'https://oss.sonatype.org/content/groups/public/' }
Expand All @@ -23,10 +23,10 @@ java { toolchain {
}}

dependencies {
compileOnly 'io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT'
compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
compileOnly 'com.github.MilkBowl:VaultAPI:1.7.1'
compileOnly 'com.bergerkiller.bukkit:BKCommonLib:1.20.6-v1'
compileOnly 'org.geysermc.geyser:api:2.2.0-SNAPSHOT'
compileOnly 'io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT'

compileOnly 'org.incendo:cloud-paper'
compileOnly 'org.incendo:cloud-annotations'
Expand Down
Loading

0 comments on commit 3fb17e2

Please sign in to comment.