Smithy/Aspects-Celestia-Compat
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from AbyssDweller/main

Browse Source 
Bug fixes and update to 1.19
This commit is contained in:
Fishplex
2022-09-05 15:06:31 -03:00
committed by GitHub
parent c085061f2e 6bdc51eaa5
commit cd869c7476
25 changed files with 53 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/7.3.1/checksums/checksums.lock
View File

Binary file not shown.

BIN
.gradle/7.3.1/checksums/md5-checksums.bin
View File

Binary file not shown.

BIN
.gradle/7.3.1/checksums/sha1-checksums.bin
View File

Binary file not shown.

BIN
.gradle/7.3.1/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
.gradle/7.3.1/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
.gradle/7.3.1/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/7.3.1/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
.gradle/7.3.1/fileHashes/resourceHashesCache.bin
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/outputFiles.bin
View File

Binary file not shown.

BIN
.gradle/file-system.probe
View File

Binary file not shown.

10
.gradle/loom-cache/launch.cfg
View File

@@ -1,14 +1,14 @@
commonProperties commonProperties
fabric.development=true fabric.development=true
fabric.remapClasspathFile=C:\Users\yena\Documents\GitHub\Aspects\.gradle\loom-cache\remapClasspath.txt fabric.remapClasspathFile=C:\Users\inscr\Documents\GitHub\Aspects\.gradle\loom-cache\remapClasspath.txt
log4j.configurationFile=C:\Users\yena\Documents\GitHub\Aspects\.gradle\loom-cache\log4j.xml log4j.configurationFile=C:\Users\inscr\Documents\GitHub\Aspects\.gradle\loom-cache\log4j.xml
log4j2.formatMsgNoLookups=true log4j2.formatMsgNoLookups=true
fabric.log.disableAnsi=false fabric.log.disableAnsi=false
clientArgs clientArgs
--assetIndex --assetIndex
1.18.2-1.18 1.18.2-1.18
--assetsDir --assetsDir
C:\Users\yena\.gradle\caches\fabric-loom\assets C:\Users\inscr\.gradle\caches\fabric-loom\assets
clientProperties clientProperties
java.library.path=C:\Users\yena\.gradle\caches\fabric-loom\1.18.2\natives java.library.path=C:\Users\inscr\.gradle\caches\fabric-loom\1.18.2\natives
org.lwjgl.librarypath=C:\Users\yena\.gradle\caches\fabric-loom\1.18.2\natives org.lwjgl.librarypath=C:\Users\inscr\.gradle\caches\fabric-loom\1.18.2\natives

2
.gradle/loom-cache/remapClasspath.txt
View File

File diff suppressed because one or more lines are too long

2
README.md
View File

@@ -10,3 +10,5 @@ Aspects is an element-based Origins addon, meaning it expands the functions and
- [Origins](https://www.curseforge.com/minecraft/mc-mods/origins) - [Origins](https://www.curseforge.com/minecraft/mc-mods/origins)
- [Origins Extra Keybinds](https://www.curseforge.com/minecraft/mc-mods/origins-extra-keybinds) - [Origins Extra Keybinds](https://www.curseforge.com/minecraft/mc-mods/origins-extra-keybinds)

2
build.gradle
View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '0.10-SNAPSHOT' id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }

297
build/resources/main/data/aspects/powers/negate_fall_damage.json
View File

@@ -1,298 +1,27 @@
{ {
"type": "origins:multiple", "type": "origins:multiple",
"fall_immunity": {
"slowness_when_fall1": { "type": "origins:invulnerability",
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 0,
"duration": 100
}
},
"damage_condition": { "damage_condition": {
"type": "origins:and", "type": "origins:name",
"conditions": [ "name": "fall"
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 3.0
}
]
}, },
"cooldown": 20 "cooldown": 1
}, },
"slowness_when_flyintowall1": { "kinetic_immunity": {
"type": "origins:self_action_when_hit", "type": "origins:invulnerability",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 0,
"duration": 100
}
},
"damage_condition": { "damage_condition": {
"type": "origins:and", "type": "origins:name",
"conditions": [ "name": "flyIntoWall"
{
"type": "origins:name",
"name": "flyIntoWall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 3.0
}
]
}, },
"cooldown": 20 "cooldown": 1
},
"slowness_when_fall3": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 1,
"duration": 100
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 6.0
}
]
},
"cooldown": 20
},
"slowness_when_flyintowall3": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 1,
"duration": 100
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "flyIntoWall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 6.0
}
]
},
"cooldown": 20
},
"slowness_when_fall5": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 2,
"duration": 120
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 10.0
}
]
},
"cooldown": 20
},
"slowness_when_flyintowall5": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 2,
"duration": 120
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "flyIntoWall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 10.0
}
]
},
"cooldown": 20
},
"slowness_when_fall7": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 3,
"duration": 140
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 14.0
}
]
},
"cooldown": 20
},
"slowness_when_flyintowall7": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 3,
"duration": 140
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "flyIntoWall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 14.0
}
]
},
"cooldown": 20
},
"slowness_when_fall9": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 4,
"duration": 140
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 18.0
}
]
},
"cooldown": 20
},
"slowness_when_flyintowall9": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 4,
"duration": 140
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "flyIntoWall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 18.0
}
]
},
"cooldown": 20
},
"reduced_kinetic_damage": {
"type": "origins:modify_damage_taken",
"modifier": {
"name": "More kinetic damage taken",
"value": -99999,
"operation": "multiply_base"
},
"damage_condition": {
"type": "origins:or",
"conditions": [
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:name",
"name": "flyIntoWall"
}
]
}
}, },
"name":"Negate Falling", "name":"Negate Falling",
"description":"You cannot take fall damage, but the more fall damage that is absorbed by the atmosphere, the more your movement speed will temporarily decrease.", "description":"You cannot take fall damage.",
"badges": [ "badges": [
{ {
"sprite": "aspects:textures/gui/badge/equal.png", "sprite": "aspects:textures/gui/badge/equal.png",
"text": "Neutral" "text": "Neutral"
} }
] ]
} }

2
build/resources/main/fabric.mod.json
View File

@@ -1,7 +1,7 @@
{ {
"schemaVersion": 1, "schemaVersion": 1,
"id": "aspects", "id": "aspects",
"version": "1.0.6", "version": "1.0.7",
"name": "Aspects", "name": "Aspects",
"description": "An element-based Origins addon for the Fabric modloader.", "description": "An element-based Origins addon for the Fabric modloader.",

12
gradle.properties
View File

@@ -4,15 +4,15 @@ org.gradle.java.home=C:/Program Files/Java/jdk-17.0.2
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/versions.html # check these on https://fabricmc.net/versions.html
minecraft_version=1.18.2 minecraft_version=1.19
yarn_mappings=1.18.2+build.3 yarn_mappings=1.19+build.4
loader_version=0.14.6 loader_version=0.14.9
# Mod Properties # Mod Properties
mod_version = 1.0.6 mod_version = 1.0.8
maven_group = com.aspects maven_group = com.aspects
archives_base_name = aspects archives_base_name = aspects
origins_version=v1.4.1 origins_version=v1.6.2
# Dependencies # Dependencies
fabric_version=0.54.0+1.18.2 fabric_version=0.58.0+1.19

2
src/main/resources/aspects.mixins.json
View File

@@ -2,7 +2,7 @@
"required": true, "required": true,
"minVersion": "0.8", "minVersion": "0.8",
"package": "net.fabricmc.fishplex.mixin", "package": "net.fabricmc.fishplex.mixin",
"compatibilityLevel": "JAVA_16", "compatibilityLevel": "JAVA_17",
"mixins": [ "mixins": [
], ],
"client": [ "client": [

4
src/main/resources/data/aspects/origins/anemo/tempus.json
View File

@@ -1,10 +1,8 @@
{ {
"powers": [ "powers": [
"aspects:fleet", "aspects:fleet",
"aspects:storm_strength",
"aspects:lightning_immunity", "aspects:lightning_immunity",
"aspects:tempus_primary", "aspects:tempus_primary"
"aspects:tempus_secondary"
], ],
"icon": { "icon": {
"item": "minecraft:amethyst_shard" "item": "minecraft:amethyst_shard"

4
src/main/resources/data/aspects/powers/fleet.json
View File

@@ -2,11 +2,11 @@
"type": "origins:attribute", "type": "origins:attribute",
"modifier": { "modifier": {
"attribute": "minecraft:generic.movement_speed", "attribute": "minecraft:generic.movement_speed",
"value": 0.01, "value": 0.03,
"operation": "addition" "operation": "addition"
}, },
"name":"Like Lightning", "name":"Like Lightning",
"description":"You are an even faster variant of Anemo. / +0.01 movement speed", "description":"You are an even faster variant of Anemo. / +0.03 movement speed",
"badges": [ "badges": [
{ {
"sprite": "aspects:textures/gui/badge/check.png", "sprite": "aspects:textures/gui/badge/check.png",

6
src/main/resources/data/aspects/powers/lightning_immunity.json
View File

@@ -1,12 +1,8 @@
{ {
"type": "origins:modify_damage_taken", "type": "origins:invulnerability",
"damage_condition": { "damage_condition": {
"type": "origins:name", "type": "origins:name",
"name":"lightningBolt" "name":"lightningBolt"
}, },
"modifier": {
"operation": "addition",
"value": -1000
},
"hidden": true "hidden": true
} }

297
src/main/resources/data/aspects/powers/negate_fall_damage.json
View File

@@ -1,298 +1,27 @@
{ {
"type": "origins:multiple", "type": "origins:multiple",
"fall_immunity": {
"slowness_when_fall1": { "type": "origins:invulnerability",
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 0,
"duration": 100
}
},
"damage_condition": { "damage_condition": {
"type": "origins:and", "type": "origins:name",
"conditions": [ "name": "fall"
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 3.0
}
]
}, },
"cooldown": 20 "cooldown": 1
}, },
"slowness_when_flyintowall1": { "kinetic_immunity": {
"type": "origins:self_action_when_hit", "type": "origins:invulnerability",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 0,
"duration": 100
}
},
"damage_condition": { "damage_condition": {
"type": "origins:and", "type": "origins:name",
"conditions": [ "name": "flyIntoWall"
{
"type": "origins:name",
"name": "flyIntoWall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 3.0
}
]
}, },
"cooldown": 20 "cooldown": 1
},
"slowness_when_fall3": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 1,
"duration": 100
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 6.0
}
]
},
"cooldown": 20
},
"slowness_when_flyintowall3": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 1,
"duration": 100
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "flyIntoWall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 6.0
}
]
},
"cooldown": 20
},
"slowness_when_fall5": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 2,
"duration": 120
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 10.0
}
]
},
"cooldown": 20
},
"slowness_when_flyintowall5": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 2,
"duration": 120
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "flyIntoWall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 10.0
}
]
},
"cooldown": 20
},
"slowness_when_fall7": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 3,
"duration": 140
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 14.0
}
]
},
"cooldown": 20
},
"slowness_when_flyintowall7": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 3,
"duration": 140
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "flyIntoWall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 14.0
}
]
},
"cooldown": 20
},
"slowness_when_fall9": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 4,
"duration": 140
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 18.0
}
]
},
"cooldown": 20
},
"slowness_when_flyintowall9": {
"type": "origins:self_action_when_hit",
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:slowness",
"amplifier": 4,
"duration": 140
}
},
"damage_condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:name",
"name": "flyIntoWall"
},
{
"type": "origins:amount",
"comparison": ">=",
"compare_to": 18.0
}
]
},
"cooldown": 20
},
"reduced_kinetic_damage": {
"type": "origins:modify_damage_taken",
"modifier": {
"name": "More kinetic damage taken",
"value": -99999,
"operation": "multiply_base"
},
"damage_condition": {
"type": "origins:or",
"conditions": [
{
"type": "origins:name",
"name": "fall"
},
{
"type": "origins:name",
"name": "flyIntoWall"
}
]
}
}, },
"name":"Negate Falling", "name":"Negate Falling",
"description":"You cannot take fall damage, but the more fall damage that is absorbed by the atmosphere, the more your movement speed will temporarily decrease.", "description":"You cannot take fall damage.",
"badges": [ "badges": [
{ {
"sprite": "aspects:textures/gui/badge/equal.png", "sprite": "aspects:textures/gui/badge/equal.png",
"text": "Neutral" "text": "Neutral"
} }
] ]
} }

6
src/main/resources/data/aspects/powers/tempus_primary.json
View File

@@ -2,7 +2,7 @@
"type": "origins:active_self", "type": "origins:active_self",
"entity_action": { "entity_action": {
"type": "origins:raycast", "type": "origins:raycast",
"distance": 8, "distance": 16,
"block": true, "block": true,
"entity": true, "entity": true,
"shape_type": "visual", "shape_type": "visual",
@@ -14,14 +14,14 @@
"amount": 2, "amount": 2,
"source": { "source": {
"name": "lightningBolt", "name": "lightningBolt",
"bypasses_armor": false "bypasses_armor": true
} }
} }
}, },
"command_at_hit": "function aspects:lightning_bolt", "command_at_hit": "function aspects:lightning_bolt",
"command_step": 1 "command_step": 1
}, },
"cooldown": 240, "cooldown": 200,
"hud_render": { "hud_render": {
"should_render": true, "should_render": true,
"sprite_location": "origins:textures/gui/resource_bar.png", "sprite_location": "origins:textures/gui/resource_bar.png",

6
src/main/resources/fabric.mod.json
View File

@@ -28,11 +28,11 @@
], ],
"depends": { "depends": {
"fabricloader": ">=0.11.3", "fabricloader": ">=0.14.9",
"fabric": "*", "fabric": "*",
"minecraft": "1.18.x", "minecraft": "1.19.*",
"java": ">=17", "java": ">=17",
"extrakeybinds":"*", "extrakeybinds":"*",
"origins": ">=1.4.1" "origins": ">=1.6.2"
} }
} }