Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
kennytv committed Sep 21, 2023
2 parents e2788ca + c164228 commit 27ff6d4
Show file tree
Hide file tree
Showing 161 changed files with 3,523 additions and 1,539 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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
25 changes: 0 additions & 25 deletions .github/workflows/maven.yml

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Publish to Hangar and Modrinth
on:
push:
branches:
- master
- dev

jobs:
publish:
if: github.repository_owner == 'ViaVersion'
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: Publish
env:
HANGAR_TOKEN: ${{ secrets.HANGAR_TOKEN }}
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
run: ./gradlew build modrinth publishAllPublicationsToHangar
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.

29 changes: 21 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
# 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)

Releases / Dev Builds
**ViaVersion addon to allow 1.8.x and 1.7.x clients on newer server versions.** <br>
Runs on 1.9-latest servers or 1.8 clients and lower.

**On Fabric, use either [ViaFabric](https://modrinth.com/mod/viafabric) or [ViaFabricPlus](https://modrinth.com/mod/viafabricplus). To override the included version**
- in **ViaFabric**, put ViaRewind into the `mods` folder
- in **ViaFabricPlus**, put ViaRewind into the `ViaFabricPlus/jars` folder

**Depending on the platform and version, this also requires [ViaVersion](https://modrinth.com/mod/viaversion) and [ViaBackwards](https://modrinth.com/mod/viabackwards).**

Support Status
-
**Requires [ViaVersion](https://viaversion.com/) ([ViaFabric](https://viaversion.com/fabric) on Fabric) to be installed**

You can find the latest dev builds here:\
**Jenkins:** https://ci.viaversion.com/view/ViaRewind/
While ViaRewind will keep getting updates to function with changes to ViaVersion or ViaBackwards, it will likely not receive many bug fixes or additional features anymore.

**Spigot page:** https://www.spigotmc.org/resources/viarewind.52109/
Releases / Dev Builds
-
Dev builds for **all** of our projects are on our Jenkins server:

**CurseForge mod page:** https://www.curseforge.com/minecraft/mc-mods/viarewind
- **Jenkins**: https://ci.viaversion.com/view/ViaRewind/

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
131 changes: 0 additions & 131 deletions all/pom.xml

This file was deleted.

7 changes: 7 additions & 0 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
plugins {
id "groovy-gradle-plugin"
}

repositories {
gradlePluginPortal()
}
91 changes: 91 additions & 0 deletions buildSrc/src/main/groovy/com.viaversion.java-conventions.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
plugins {
id "java-library"
id "maven-publish"
}

repositories {
mavenLocal()
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}"
}

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

java.sourceCompatibility = JavaVersion.VERSION_1_8

tasks {
// Variable replacements
processResources {
inputs.property "version", project.version

for (final def file in ["plugin.yml", "bungee.yml", "META-INF/sponge_plugins.json", "fabric.mod.json"]) {
filesMatching(file) {
expand "version": version
}
}
}
}

publishing {
repositories {
maven {
name = "Via"
url = "https://repo.viaversion.com/"

credentials(PasswordCredentials)
authentication {
basic(BasicAuthentication)
}
}
}
publications {
main(MavenPublication) {
artifactId = project.maven_name
groupId = project.maven_group
version = project.maven_version

from(components.java)
}
}
}

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}

tasks.withType(Javadoc) {
options.encoding = 'UTF-8'
}
9 changes: 9 additions & 0 deletions bukkit/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
plugins {
id "com.viaversion.java-conventions"
}

dependencies {
api project(":viarewind-common")

compileOnly(annotationProcessor("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
Loading

0 comments on commit 27ff6d4

Please sign in to comment.