Skip to content

Commit

Permalink
several changes
Browse files Browse the repository at this point in the history
  • Loading branch information
PinkGoosik committed Jul 28, 2022
1 parent 84f994e commit e5ca875
Show file tree
Hide file tree
Showing 75 changed files with 1,301 additions and 1,286 deletions.
26 changes: 26 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
tab_width = 4
trim_trailing_whitespace = true

[*.gradle]
indent_style = tab

[*.java]
indent_style = tab

[*.json]
indent_style = space
indent_size = 2

[*.toml]
indent_style = tab
tab_width = 2

[.editorconfig]
indent_style = space
indent_size = 4
29 changes: 10 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,29 @@
# Automatically build the project and run any configured tests for every push
# and submitted pull request. This can help catch issues that only occur on
# certain platforms or Java versions, and provides a first line of defence
# against bad commits.

name: build
on: [pull_request, push]
on: [ pull_request, push ]

jobs:
build:
strategy:
matrix:
# Use these Java versions
java: [
17, # Current Java LTS & minimum supported by Minecraft
]
# and run on both Linux and Windows
os: [ubuntu-20.04]
java: [ 17 ]
os: [ ubuntu-20.04 ]
runs-on: ${{ matrix.os }}
steps:
- name: checkout repository
uses: actions/checkout@v2
- name: validate gradle wrapper
- name: Checkout repository
uses: actions/checkout@v3
- name: Validate gradle wrapper
uses: gradle/wrapper-validation-action@v1
- name: setup jdk ${{ matrix.java }}
- name: Setup JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- name: make gradle wrapper executable
- name: Make gradle wrapper executable
if: ${{ runner.os != 'Windows' }}
run: chmod +x ./gradlew
- name: build
run: ./gradlew build
- name: capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
- name: Capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '17' }}
uses: actions/upload-artifact@v2
with:
name: Artifacts
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/publish-curseforge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Build artifacts
run: ./gradlew build
- name: publish artifacts
uses: Kir-Antipov/mc-publish@v3.0
uses: Kir-Antipov/mc-publish@v3.1
with:
curseforge-id: 521126
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
Expand All @@ -31,13 +31,16 @@ jobs:
version-type: beta
loaders: |
fabric
quilt
game-versions: |
1.19
1.19.1
dependencies: |
fabric-api | depends | *
cloth-config | depends | *
java: |
17
retry-attempts: 2
retry-delay: 10000
retry-delay: 10000
7 changes: 5 additions & 2 deletions .github/workflows/publish-modrinth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Build artifacts
run: ./gradlew build
- name: publish artifacts
uses: Kir-Antipov/mc-publish@v3.0
uses: Kir-Antipov/mc-publish@v3.1
with:
modrinth-id: rI0hvYcd
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
Expand All @@ -31,13 +31,16 @@ jobs:
version-type: beta
loaders: |
fabric
quilt
game-versions: |
1.19
1.19.1
dependencies: |
fabric-api | depends | *
cloth-config | depends | *
java: |
17
retry-attempts: 2
retry-delay: 10000
retry-delay: 10000
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@
[![CurseForge Downloads](https://cf.way2muchnoise.eu/full_visuality_downloads.svg)](https://curseforge.com/minecraft/mc-mods/visuality)
[![Minecraft Versions](https://cf.way2muchnoise.eu/versions/visuality.svg)](https://curseforge.com/minecraft/mc-mods/visuality)

Visuality is a Minecraft mod for fabric loader. This is a simple client-sided cosmetic mod that will add a bunch of new particles such as crystal sparkles, particles on mob hitting, custom blob particles for slimes, environmental particles to your Minecraft world. Expect particles collection expanding with the mod updates!
Visuality is a Minecraft mod for fabric loader. This is a simple client-sided cosmetic mod that will add a bunch of new
particles such as crystal sparkles, particles on mob hitting, custom blob particles for slimes, environmental particles
to your Minecraft world. Expect particles collection expanding with the mod updates!

#### [Discord Server](https://discord.gg/DcemWeskeZ) | [Modrinth Page](https://modrinth.com/mod/visuality) | [CurseForge Page](https://curseforge.com/minecraft/mc-mods/visuality)

## Configuration
You can configure the mod by editing visuality.json in the config folder of your Minecraft directory or simply through ModMenu integration.

You can configure the mod by editing visuality.json in the config folder of your Minecraft directory or simply through
ModMenu integration.
35 changes: 16 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "fabric-loom" version "0.12-SNAPSHOT"
id "io.github.juuxel.loom-quiltflower" version "1.7.2"
id "io.github.juuxel.loom-quiltflower" version "1.7.3"
id "io.github.p03w.machete" version "1.1.2"
}

Expand All @@ -10,32 +10,30 @@ group = project.maven_group

repositories {
maven {
url "https://api.modrinth.com/maven"
content { includeGroup "maven.modrinth" }
}
url "https://api.modrinth.com/maven"
content { includeGroup "maven.modrinth" }
}
maven { url "https://maven.terraformersmc.com" } //modmenu
maven { url "https://maven.parchmentmc.org" } //parchment
maven { url "https://maven.shedaniel.me" } //cloth-config
maven { url "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" } //dev-auth
maven { url "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" }
}

dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings loom.layered() {
officialMojangMappings()
// parchment("org.parchmentmc.data:parchment-1.18.2:2022.05.02@zip")
}
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "com.terraformersmc:modmenu:4.0.0"
modImplementation("me.shedaniel.cloth:cloth-config-fabric:7.0.65") {
exclude(group: "net.fabricmc.fabric-api")
modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api}"
modImplementation "com.terraformersmc:modmenu:4.0.5"
modImplementation("me.shedaniel.cloth:cloth-config-fabric:7.0.73") {
exclude(group: "net.fabricmc.fabric-api")
exclude(group: "com.terraformersmc")
}
}

modLocalRuntime "maven.modrinth:lazydfu:0.1.2"
// modLocalRuntime "maven.modrinth:ferrite-core:4.2.0"
modLocalRuntime "maven.modrinth:starlight:1.1.0+1.19"
modLocalRuntime "maven.modrinth:lazydfu:0.1.3"
modLocalRuntime "maven.modrinth:ferrite-core:5.0.0-fabric"
modLocalRuntime "maven.modrinth:starlight:1.1.1+1.19"
modLocalRuntime "me.djtheredstoner:DevAuth-fabric:1.0.0"
}

Expand All @@ -54,12 +52,11 @@ tasks.withType(JavaCompile).configureEach {
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

withSourcesJar()
}

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
rename { "${it}_${project.archivesBaseName}" }
}
}
}
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ org.gradle.jvmargs = -Xmx1G
org.gradle.parallel = true

# Mod Properties
mod_version = 0.5.0
mod_version = 0.5.1
maven_group = ru.pinkgoosik
archives_base_name = visuality

# Dependencies
minecraft_version = 1.19
loader_version = 0.14.6
fabric_version = 0.55.1+1.19
minecraft_version = 1.19.1
fabric_loader = 0.14.8
fabric_api = 0.58.4+1.19.1
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
10 changes: 5 additions & 5 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionBase = GRADLE_USER_HOME
distributionPath = wrapper/dists
distributionUrl = https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase = GRADLE_USER_HOME
zipStorePath = wrapper/dists
6 changes: 6 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
14 changes: 8 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
21 changes: 8 additions & 13 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
pluginManagement {
repositories {
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
maven {
name = 'Cotton'
url = 'https://server.bbkr.space/artifactory/libs-release/'
}
mavenCentral()
gradlePluginPortal()
}
}
repositories {
mavenCentral()
gradlePluginPortal()
maven { url "https://maven.fabricmc.net" }
maven { url "https://maven.quiltmc.org/repository/release" }
maven { url "https://server.bbkr.space/artifactory/libs-release" }
}
}
35 changes: 0 additions & 35 deletions src/main/java/ru/pinkgoosik/visuality/VisualityMod.java

This file was deleted.

This file was deleted.

Loading

0 comments on commit e5ca875

Please sign in to comment.