Skip to content

Commit

Permalink
Merge pull request #2 from unilock/fabric-fix-fix
Browse files Browse the repository at this point in the history
Support advancements
  • Loading branch information
fooooooooooooooo authored Dec 27, 2022
2 parents f769f27 + 7d521c1 commit 5357255
Show file tree
Hide file tree
Showing 23 changed files with 148 additions and 281 deletions.
112 changes: 26 additions & 86 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,100 +1,40 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# gradle

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries
.gradle
build
run
.gradle/
build/
out/
classes/

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
# eclipse

# CMake
cmake-build-*/
*.launch

# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# idea

# File-based project format
.idea/
*.iml
*.ipr
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/
# vscode

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/
.settings/
.vscode/
bin/
.classpath
.project

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# macos

# Editor-based Rest Client
.idea/httpRequests
*.DS_Store

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
# fabric

target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
# https://github.com/takari/maven-wrapper#usage-without-binary-jar
.mvn/wrapper/maven-wrapper.jar
run/

# Eclipse m2e generated files
# Eclipse Core
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath
# java

.m2/settings.xml
hs_err_*.log
replay_*.log
*.hprof
*.jfr
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

16 changes: 0 additions & 16 deletions .idea/compiler.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/encodings.xml

This file was deleted.

30 changes: 0 additions & 30 deletions .idea/jarRepositories.xml

This file was deleted.

18 changes: 0 additions & 18 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/runConfigurations.xml

This file was deleted.

16 changes: 0 additions & 16 deletions .idea/runConfigurations/Minecraft_Client.xml

This file was deleted.

16 changes: 0 additions & 16 deletions .idea/runConfigurations/Minecraft_Server.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# yep-paper
# yep

Companion fabric mod for VelocityDiscord
Companion Fabric mod for VelocityDiscord

Allows VelocityDiscord to send death/advancement messages by sending them on the plugin channel velocity:yep
69 changes: 32 additions & 37 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,67 +1,62 @@
plugins {
id 'fabric-loom' version '1.0-SNAPSHOT';
id 'maven-publish';
id 'fabric-loom' version '1.0-SNAPSHOT'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_17;
targetCompatibility = JavaVersion.VERSION_17;
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name;
version = project.mod_version;
group = project.maven_group;
archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group

repositories {
maven {
url 'https://maven.bymartrixx.me';
}
}

dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}";
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2";
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}";

modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}";
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

modImplementation "me.bymartrixx.player-events:api:${project.player_events_api_version}";
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
}

processResources {
inputs.property "version", project.version;
inputs.property "version", project.version

filesMatching("fabric.mod.json") {
expand "version": project.version;
}
filesMatching("fabric.mod.json") {
expand "version": project.version
}
}

tasks.withType(JavaCompile).configureEach {
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 17;
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 17
}

java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar();
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
}

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"};
}
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
}
}

// configure the maven publication
publishing {
publications {
mavenJava(MavenPublication) {
from components.java;
}
}
publications {
mavenJava(MavenPublication) {
from components.java
}
}

// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {

}
}
}
Loading

0 comments on commit 5357255

Please sign in to comment.