Skip to content
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.

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

Rebase Project #449

Merged
merged 8 commits into from
Aug 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: ViaRewind CI
on: [pull_request, push, workflow_dispatch]

jobs:
build:
runs-on: ubuntu-22.04
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
check-latest: true
- name: Cache Dependencies
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Build with Gradle
run: ./gradlew build
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: Artifacts
path: build/libs/
25 changes: 0 additions & 25 deletions .github/workflows/maven.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .idea/copyright/profile_settings.xml

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

6 changes: 6 additions & 0 deletions .idea/copyright/viarewind_gpl.xml

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

13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# ViaRewind
Allow 1.8.x and 1.7.x on your newer server
[![Build Status](https://github.com/ViaVersion/ViaRewind/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/ViaVersion/ViaRewind/actions)
[![Discord](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://viaversion.com/discord)

**Allow 1.8.x and 1.7.x on your newer server**

Releases / Dev Builds
-
Expand All @@ -15,3 +18,11 @@ You can find the latest dev builds here:\
Other Links
-
**Maven:** https://repo.viaversion.com/

**Issue tracker:** https://github.com/ViaVersion/ViaRewind/issues

**List of contributors:** https://github.com/ViaVersion/ViaRewind/graphs/contributors

License
-
This project is licensed under the [GNU General Public License](LICENSE).
131 changes: 0 additions & 131 deletions all/pom.xml

This file was deleted.

47 changes: 47 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import java.nio.charset.StandardCharsets

subprojects {
apply plugin: "java-library"
apply plugin: "maven-publish"

archivesBaseName = project.maven_name
group = project.maven_group
version = project.maven_version

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

repositories {
maven {
url = uri("https://repo.viaversion.com")
}
maven {
url = uri("https://repo.maven.apache.org/maven2/")
}
maven {
url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
}
maven {
url = uri("https://oss.sonatype.org/content/repositories/snapshots")
}
maven {
url = uri("https://maven.fabricmc.net/")
}
maven {
url = uri("https://repo.spongepowered.org/repository/maven-public/")
}
maven {
url = uri("https://nexus.velocitypowered.com/repository/maven-public/")
}
}

dependencies {
compileOnly "com.viaversion:viaversion:${project.viaversion_version}"
compileOnly "io.netty:netty-all:${project.netty_version}"
compileOnly "com.google.guava:guava:${project.guava_version}"
}

compileJava {
options.encoding = StandardCharsets.UTF_8
}
}
5 changes: 5 additions & 0 deletions bukkit/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependencies {
api project(":viarewind-common")

compileOnly "org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT"
}
1 change: 1 addition & 0 deletions bukkit/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
maven_name=viarewind-bukkit
52 changes: 0 additions & 52 deletions bukkit/pom.xml

This file was deleted.

19 changes: 19 additions & 0 deletions bukkit/src/main/java/de/gerrygames/viarewind/BukkitPlugin.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/*
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
* Copyright (C) 2016-2023 ViaVersion and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package de.gerrygames.viarewind;

import de.gerrygames.viarewind.api.ViaRewindConfigImpl;
Expand All @@ -7,6 +25,7 @@
import java.io.File;

public class BukkitPlugin extends JavaPlugin implements ViaRewindPlatform {

@Override
public void onEnable() {
ViaRewindConfigImpl conf = new ViaRewindConfigImpl(new File(getDataFolder(), "config.yml"));
Expand Down
2 changes: 1 addition & 1 deletion bukkit/src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ main: de.gerrygames.viarewind.BukkitPlugin
api-version: 1.13
folia-supported: true

authors: [Gerrygames]
authors: [Gerrygames, FlorianMichael/EnZaXD, creeper123321123]
website: https://viaversion.com/rewind

load: STARTUP
Expand Down
5 changes: 5 additions & 0 deletions bungee/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependencies {
api project(":viarewind-common")

compileOnly "net.md-5:bungeecord-api:1.16-R0.5-SNAPSHOT"
}
1 change: 1 addition & 0 deletions bungee/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
maven_name=viarewind-bungee
Loading
Loading