Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Filesystem #55

Draft
wants to merge 42 commits into
base: 1.19.3
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d744b71
Fixed an build error.
XyperCode Mar 27, 2023
5a69537
Merge branch '1.19.3-development' into updated-filesystem
XyperCode Apr 1, 2023
15fa5f9
Merge branch '1.19.3-development' into Qboi123-updated-filesystem
XyperCode Jun 16, 2023
de56ae5
Drop 1.18.2, 1.18.2 and LTS 1.19.3
Jab125 Aug 12, 2023
cb01503
buildscript changes
Jab125 Aug 12, 2023
0ef8d9c
Fix compile errors part 1
Jab125 Aug 12, 2023
8d0052f
Fix compile errors part 2
Jab125 Aug 12, 2023
a4495e8
Fix compile errors part 3
Jab125 Aug 12, 2023
a244111
Fix compile errors part 4
Jab125 Aug 12, 2023
8b2a3b5
increase compiler error output
Jab125 Aug 12, 2023
ea02da8
Fix compile errors part 5
Jab125 Aug 12, 2023
38474a2
Fix compiler errors part 6
Jab125 Aug 13, 2023
eb24abc
Fix compiler errors part 7
Jab125 Aug 13, 2023
3882ee5
Fabric works now
Jab125 Aug 13, 2023
c022a34
use null safe equals
Jab125 Aug 13, 2023
9d485b0
Fix some rendering issues
Jab125 Aug 13, 2023
79acdde
Restore `renderItem` correct functionality
Jab125 Aug 13, 2023
310a81b
Fix creative tab
Jab125 Aug 13, 2023
79748e5
Fix shadows
Jab125 Aug 13, 2023
17edd30
Update SECURITY.md
Jab125 Aug 13, 2023
4f05f6b
Fix fabric datagen helper compiler error
Jab125 Aug 13, 2023
ef06fab
Merge pull request #78 from Ultreon/Jab125/1.20.1-port
XyperCode Aug 25, 2023
7b20547
Update README to also add 1.20.1 (#81)
Jab125 Sep 2, 2023
aade104
Update mod metadata
XyperCode Sep 22, 2023
e63ff7c
Update parchment version
XyperCode Sep 22, 2023
a5119dd
Merge branch 'local/1.20.1' into 1.20.1
XyperCode Sep 22, 2023
39cadc0
Update README.md
XyperCode Oct 8, 2023
c2386e3
Update README.md
XyperCode Oct 16, 2023
05be672
Fix Architectury Forge version
XyperCode Nov 19, 2023
c0b26b7
Merge branch '1.20.1' into merge-issue-84
XyperCode Nov 23, 2023
c4b1ab5
Merge pull request #86 from Ultreon/merge-issue-84
XyperCode Nov 23, 2023
cf4f7d0
Remove broken emojiful dependency.
XyperCode Nov 25, 2023
a947512
Remove Geckolib maven
XyperCode Nov 25, 2023
7747b42
Fix the mess I accidentally created
XyperCode Nov 26, 2023
e32ad84
Merge pull request #88 from Ultreon/XyperCode/fix-my-mess
XyperCode Nov 26, 2023
29fef56
Version 0.8.1
XyperCode Nov 26, 2023
8082aac
💾 Fix flash drive issues.
XyperCode Nov 27, 2023
a8ee01e
🗑️ Remove debug code (forgor in prev. commit)
XyperCode Nov 27, 2023
40621b0
Added recipes
XyperCode Jan 27, 2024
33a7315
Merge pull request #93 from Ultreon/92-screen-and-ethernet-cables-are…
XyperCode Jan 27, 2024
f351d39
Merge branch '1.20.1' into Qboi123-updated-filesystem
XyperCode Feb 2, 2024
d813a75
Trying to improve stuff 👍
XyperCode Feb 3, 2024
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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Ultreon Devices Mod [![CircleCI](https://dl.circleci.com/status-badge/img/gh/Ultreon/devices-mod/tree/1.19.3-development.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/Ultreon/devices-mod/tree/1.19.3-development)
**Language:** Java
**Minecraft Version:** `1.19.3`
**Mod Loader:** [Forge](https://files.minecraftforge.net/) & [Fabric](https://fabricmc.net/)
**Minecraft Version:** `1.19.3`, `1.20.1`
**Mod Loader:** [Forge](https://files.minecraftforge.net/), [NeoForge](https://neoforged.net/), [Fabric](https://fabricmc.net/)
**Download:** [[CurseForge]](https://curseforge.com/minecraft/mc-mods/devices-mod), [[CurseForge Legacy]](https://legacy.curseforge.com/minecraft/mc-mods/devices-mod), [[Modrinth]](https://modrinth.com/mod/devices-mod)

*Fork of [MrCrayfish's Device Mod](https://github.com/MrCrayfish/MrCrayfishDeviceMod)*

Expand Down
23 changes: 13 additions & 10 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Maintained Versions

Will be be updated regularly
Will be updated regularly

| Minecraft Version | Supported |
| ------- | ------------------ |
| 1.19.3 | :white_check_mark: |
| 1.19.2 | :white_check_mark: |
| 1.18.2 | :warning: (Features may be occasionally ported to 1.18.2)|
| 1.20.1 | :white_check_mark: |
| 1.19.3 | :warning: (EOL) |
| 1.19.2 | :x: |
| 1.18.2 | :x: (Features may be occasionally ported to 1.18.2)|
| 1.16.5 | :x: (no version exists, so stop asking) |
| 1.12.2 | :x: |

Expand All @@ -15,12 +16,14 @@ Will be be updated regularly

Will be updated to patch security vulnerabilities

| Minecraft Version | Supported |
| ------- | ------------------ |
| 1.19.2 | :white_check_mark: |
| 1.18.2 | :white_check_mark: |
| 1.16.5 | :x: (no version exists, so stop asking) |
| 1.12.2 | :white_check_mark: |
| Minecraft Version | Supported |
| ------- |-----------------------------------------|
| 1.20.1 | :white_check_mark: |
| 1.19.3 | :warning: (EOL) |
| 1.19.2 | :x: |
| 1.18.2 | :x: |
| 1.16.5 | :x: (no version exists, so stop asking) |
| 1.12.2 | :white_check_mark: |

## Reporting a Vulnerability

Expand Down
14 changes: 12 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ subprojects {
url = 'https://repo.spongepowered.org/repository/maven-public/'
}

maven {
name = "Fuzs Mod Resources"
url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"
}

maven {
name = 'BlameJared Maven (CrT / Bookshelf)'
url = 'https://maven.blamejared.com'
Expand Down Expand Up @@ -63,15 +68,14 @@ subprojects {
url = "https://dvs1.progwml6.com/files/maven/"
}
maven { url "https://maven.architectury.dev/" }
maven { url 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/' }
}

dependencies {
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
// The following line declares the mojmap mappings, you may use other mappings as well
mappings loom.layered() {
officialMojangMappings()
parchment("org.parchmentmc.data:parchment-1.19.2:2022.08.10@zip")
parchment("org.parchmentmc.data:parchment-1.20.1:2023.09.03@zip")
}

// layered
Expand Down Expand Up @@ -108,6 +112,12 @@ allprojects {
java {
withSourcesJar()
}

gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xmaxerrs" << "9999"
}
}
}

void setupRepositories(RepositoryHandler repositories) {
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
// modApi "com.ultreon:ultranlang:0.1.0+6"
modApi "com.jab125:apoint:1.0.0"

modCompileOnly "curse.maven:forgeapiportfabric-547434:3671141"
modCompileOnly "fuzs.forgeconfigapiport:forgeconfigapiport-common:8.0.0"
modCompileOnly 'com.electronwill.night-config:core:3.6.3'
modCompileOnly 'com.electronwill.night-config:toml:3.6.3'

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "devices:item/glass_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_plastic": {
"conditions": {
"items": [
{
"items": [
"devices:plastic"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "devices:ethernet_cable"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_plastic",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"devices:ethernet_cable"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_plastic": {
"conditions": {
"items": [
{
"items": [
"devices:plastic"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "devices:gpu"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_plastic",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"devices:gpu"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_plastic": {
"conditions": {
"items": [
{
"items": [
"devices:plastic"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "devices:hard_drive"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_plastic",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"devices:hard_drive"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_plastic_unrefined": {
"conditions": {
"items": [
{
"items": [
"devices:plastic_unrefined"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "devices:plastic"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_plastic_unrefined",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"devices:plastic"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_plastic": {
"conditions": {
"items": [
{
"items": [
"devices:plastic"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "devices:plastic_frame"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_plastic",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"devices:plastic_frame"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_slime_ball": {
"conditions": {
"items": [
{
"items": [
"minecraft:slime_ball"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "devices:plastic_unrefined"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_slime_ball",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"devices:plastic_unrefined"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_circuit_board": {
"conditions": {
"items": [
{
"items": [
"devices:circuit_board"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "devices:ram"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_circuit_board",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"devices:ram"
]
},
"sends_telemetry_event": false
}
Loading
Loading