Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
a75f9f8
Basic port to fabric - no configs yet
tterrag1098 Dec 11, 2018
20fdff1
Fix reflection for prod
tterrag1098 Dec 11, 2018
12c5daa
Clean up reflection, add resource pack image and reload listener
tterrag1098 Dec 12, 2018
3bffe56
Remove old transformer and tabs->spaces
tterrag1098 Dec 12, 2018
65d9375
Add rudimentary config file
tterrag1098 Dec 13, 2018
0450c92
Clean up buildscript
tterrag1098 Dec 13, 2018
f28de24
Drop buildnumber from version for now
tterrag1098 Dec 13, 2018
4dc9e52
gradle properties
tterrag1098 Dec 13, 2018
7ee13a4
Actual mod version
tterrag1098 Dec 13, 2018
a6d95db
Bump to loader .65, fix MixinMinecraftClient target strings
tterrag1098 Dec 13, 2018
19085b6
Fix gradient not fading in
tterrag1098 Dec 13, 2018
e983ab5
Update to 1.14.4
Prospector Jul 27, 2019
978380b
Fix imports and upgrade gradle to 5.5.1
Prospector Jul 27, 2019
fd386e7
Remove wildcard imports because it seems like you'd not like them
Prospector Jul 27, 2019
c4e1d33
Fix formatting that was changed
Prospector Jul 27, 2019
a7c8ff7
Fix config file name
Prospector Jul 28, 2019
d1d9468
Move Blur to Satin
Pyrofab Jul 29, 2019
3cf6a03
Update contained satin
Pyrofab Jul 30, 2019
cb98527
Fix excluded GUIs being ignored
Pyrofab Jul 30, 2019
28a8530
Update to 19w34a
Pyrofab Aug 27, 2019
7e8194a
Port to 1.16-rc1
Motschen Jun 21, 2020
fd84d68
Update to 1.16.2
Pyrofab Aug 17, 2020
d117c98
Bump version to 1.0.7
Pyrofab Aug 17, 2020
f8a4dd7
Merge pull request #1 from Pyrofab/fabric
Motschen Aug 17, 2020
432934b
2.0.0 - AutoConfig and Fade Fix
Motschen Nov 8, 2020
d429057
Use official Satin build, Gradle cleanup, Remove unneeded dependencies
Motschen Dec 20, 2020
a6b70f1
Create zh_cn.json
Enaium Mar 5, 2021
40d6310
Merge pull request #8 from Enaium/fabric
Motschen Mar 5, 2021
a520948
Blur 2.1.0 - MidnightConfig
Motschen Mar 5, 2021
e1346d2
Update to 1.17-pre3
Pyrofab Jun 2, 2021
994a975
Merge pull request #15 from Pyrofab/fabric-1.17
Motschen Jun 21, 2021
b77190c
Blur 2.2.1 - 1.17
Motschen Jun 21, 2021
6667f75
update minecraft version and gradle
Aug 19, 2021
3b9fa30
Merge pull request #20 from backryun/fabric-1.17
Motschen Aug 20, 2021
9feb8a4
add pt_br.json
Aug 31, 2021
b6e54fd
Merge pull request #22 from maneschy-d/patch-1
Motschen Sep 2, 2021
3800b44
Add files via upload
Felix14-v2 Sep 20, 2021
79814b4
Merge pull request #24 from Felix14-v2/fabric-1.17
Motschen Sep 24, 2021
0eb076f
Blur 2.3.0 - Update to MidnightLib v0.2.5
Motschen Sep 24, 2021
0ae5c75
Remove loftover old MidnightConfig implementation
Motschen Sep 25, 2021
55ad971
Fix internal version
NatureHog Sep 28, 2021
91be409
Update to MidnightLib v0.2.8
Oct 29, 2021
e749f18
Merge pull request #29 from backryun/patch-backryun
Motschen Oct 31, 2021
895448b
Merge pull request #25 from NatureHog/fabric-1.17
Motschen Oct 31, 2021
f792d34
Blur 2.4.0 - Ingame-Configurable Exclusions & Fixes
Motschen Oct 31, 2021
08bc0d9
Adding a swedish translation (#33)
tort-oise Dec 4, 2021
1260881
Update to 1.18
Motschen Dec 4, 2021
fadf94d
Add AdvancedChat to the exclusion list (#43)
luni3359 May 8, 2022
a199313
Fabric 1.18.2 (#40)
May 8, 2022
747188d
1.19 Update (#45)
byquanton Jun 11, 2022
b944975
Blur 2.5.0 - Update to 1.19, Better Exclusions & Colors
Motschen Jun 11, 2022
fe7229c
Add easing option to fade animation (#48)
Scrumplex Jun 26, 2022
000315b
add ko_kr.json (#47)
gyular Jun 26, 2022
eca592b
Blur 2.6.0 - Ease-in animation by @Scrumplex
Motschen Jun 26, 2022
e852317
Create uk_ua.json
Altegar Jul 26, 2022
6000ba8
Add Iris's shader pack screen to the exclusion list
TheLukeGuy Oct 10, 2022
e668f3f
Update zh_cn.json
GodGun968 Oct 16, 2022
8e0da73
migrate to 1.19.2 and update dependencies (#51)
Oct 19, 2022
13d6398
Merge pull request #49 from Altegar/patch-1
Motschen Oct 19, 2022
9c4f753
Merge pull request #52 from ConsoleLogLuke/iris-exclusion
Motschen Oct 19, 2022
35635ad
Merge pull request #53 from GodGun968/patch-1
Motschen Oct 19, 2022
2dc6806
Update Dependencys
Oct 29, 2022
7ab190d
Workflow!
Oct 29, 2022
f958e43
Merge pull request #55 from backryun/fabric-1.19
Motschen Oct 29, 2022
8a1824c
updated pt_br
FITFC Oct 30, 2022
7b253f5
Expend build environment JAVA 19 + Update midnightlib 1.0.0
Oct 31, 2022
9854e97
Update fabric API 0.66.0
Nov 9, 2022
d425455
Update gradle 7.6-rc2
Nov 9, 2022
dc7e5bb
Merge pull request #57 from backryun/fabric-1.19
Motschen Nov 12, 2022
7258cef
Merge pull request #56 from FITFC/fabric-1.19
Motschen Nov 12, 2022
7dd93da
Upstream gradle 7.6 official version + fabric API
Nov 25, 2022
dc94bd3
Upstream Fabric loader and API
Nov 30, 2022
f69af4c
Switch to 1.19.3 support
Dec 12, 2022
2fb8f29
Fix workflow for new branch
Dec 12, 2022
0d90cac
Merge pull request #61 from backryun/fabric-1.19.3
Motschen Dec 14, 2022
e139a23
Blur 2.6.1
Motschen Dec 14, 2022
77badf3
Implement fade out effect, better config screen
Motschen Mar 22, 2023
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
29 changes: 29 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
on:
push:
branches: [ "fabric-1.19.3" ]
pull_request:
branches: [ "fabric-1.19.3" ]

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build --stacktrace --info
- name: Upload a Build Artifact
uses: actions/upload-artifact@v3
with:
name: Blur-Artifact
path: build/libs/blur-*.*.jar
if-no-files-found: error
161 changes: 55 additions & 106 deletions build.gradle
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,126 +1,75 @@
buildscript {
repositories {
mavenCentral()
maven { url = "http://files.minecraftforge.net/maven" }
maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
}
dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' }
}
plugins {
id 'com.matthewprenger.cursegradle' version '1.0.9'
id 'fabric-loom' version '1.1-SNAPSHOT'
id 'maven-publish'
}

apply plugin: 'net.minecraftforge.gradle.forge'
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equals('false');
ext.buildnumber = System.getenv().BUILD_NUMBER ?: 'custom';
archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group

group = 'com.tterrag.blur'
archivesBaseName = "Blur"
version = "${mod_version}-${buildnumber}"
repositories {
maven {
name = 'Ladysnake Mods'
url = 'https://ladysnake.jfrog.io/artifactory/mods'
content {
includeGroup 'io.github.ladysnake'
includeGroupByRegex 'io\\.github\\.onyxstudios.*'
}
}
maven {
url = 'https://maven.terraformersmc.com/releases'
content {
includeGroup 'com.terraformersmc'
}
}
maven {
url = "https://api.modrinth.com/maven"
}
}

sourceCompatibility = '1.8'
targetCompatibility = '1.8'
dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

minecraft {
version = "${minecraft_version}-${forge_version}"
mappings = 'stable_29'

runDir = 'run'
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "io.github.ladysnake:satin:${satin_version}"
include "io.github.ladysnake:satin:${satin_version}"

clientJvmArgs += '-Dfml.coreMods.load=com.tterrag.blur.BlurPlugin'

replace "@VERSION@", project.version
implementation 'com.google.code.findbugs:jsr305:3.0.2'
modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
include "maven.modrinth:midnightlib:${project.midnightlib_version}"
}

processResources {
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include '**/*.info'
include '**/*.properties'

// replace version and mcversion
expand 'version': project.version, 'mcversion': project.minecraft.version
}
inputs.property "version", project.version

// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude '**/*.info'
exclude '**/*.properties'
}
filesMatching("fabric.mod.json") {
expand "version": project.version
}
}

jar.manifest {
attributes 'FMLCorePlugin': 'com.tterrag.blur.BlurPlugin'
attributes 'FMLCorePluginContainsFMLMod': 'true'
tasks.withType(JavaCompile).configureEach {
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 17
}

import org.apache.tools.ant.filters.ReplaceTokens
import groovy.json.JsonSlurper

task createResourcePacks {
def inputFile = new File("resource_packs.json")
def json = new JsonSlurper().parseText(inputFile.text)
json.each {
def pack_id = it.key
def pack_name = it.value.name
def pack_desc = it.value.description
def pack_radius = it.value.radius

def taskName = "createPack" + pack_id.capitalize();
task "${taskName}" (type: Zip) {
from ('pack_template') {
filter(ReplaceTokens, tokens: [
mod_version: project.version.toString(),
pack_version: '3',
description: pack_desc.toString(),
radius: pack_radius.toString()
])

rename(/(.+)\.template/, '$1')
}

from ('pack_icons') {
include "${pack_id}.png"
rename '.+', 'pack.png'
}

baseName = "Blur " + pack_name
}

createResourcePacks.finalizedBy taskName
}
java {
withSourcesJar()
}

// Not necessary atm
// tasks.build.dependsOn createResourcePacks

tasks.curseforge.enabled = !dev && project.hasProperty('curseforge_key')

curseforge {
if (project.hasProperty('curseforge_key')) {
apiKey = project.curseforge_key
}

project {
id = project.project_id
changelogType = 'html'
changelog = System.getenv('CHANGELOG')
if (changelog == null || 'none'.equals(changelog)) {
changelog = getChangelog() ?: ''
changelogType = 'text'
}
releaseType = project.release_type
addGameVersion '1.9.4'
addGameVersion '1.11.2'
addGameVersion '1.12'
addGameVersion '1.12.1'
mainArtifact(jar) {
displayName = "Blur ${mod_version}"
}
}
jar {
from "LICENSE"
}

// configure the maven publication
publishing {
publications {
mavenJava(MavenPublication) {
from components.java
}
}
}
23 changes: 18 additions & 5 deletions gradle.properties
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
minecraft_version=1.10.2
forge_version=12.18.3.2297
mod_version=1.0.4
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G

project_id=268324
release_type=release
# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.19.3
yarn_mappings=1.19.3+build.3
loader_version=0.14.11

# Mod Properties
mod_version = 2.7.0
maven_group = com.tterrag.blur
archives_base_name = blur

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.69.0+1.19.3
satin_version = 1.10.0
midnightlib_version=1.2.1-fabric
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed Aug 20 15:17:58 CDT 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
Loading