Skip to content

Commit 7933464

Browse files
committed
Starting to make NeoForge only
1 parent e5e279e commit 7933464

1,230 files changed

Lines changed: 2569 additions & 3507 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,5 @@
11
# Disable autocrlf on generated files, they always generate with LF
22
# Add any extra files or paths here to make git stop saying they
33
# are changed when only line endings change.
4-
*.json text eol=lf
5-
*.toml text eol=lf
6-
*.properties text eol=lf
7-
*.yaml text eol=lf
8-
*.yml text eol=lf
9-
*.mcmeta text eol=lf
10-
*.kt text eol=lf
11-
*.cpp text eol=lf
12-
*.hpp text eol=lf
13-
*.cc text eol=lf
14-
*.c text eol=lf
15-
*.h text eol=lf
16-
*.cs text eol=lf
17-
*.py text eol=lf
18-
*.rby text eol=lf
19-
*.html text eol=lf
20-
*.css text eol=lf
21-
*.js text eol=lf
22-
*.xml text eol=lf
23-
*.svg text eol=lf
24-
*.java text eol=lf
25-
*.groovy text eol=lf
26-
*.gradle text eol=lf
27-
*.scala text eol=lf
28-
*.txt text eol=lf
29-
*.md text eol=lf
30-
*.ulang text eol=lf
31-
*.ezlang text eol=lf
4+
src/generated/**/.cache/* text eol=lf
5+
src/generated/**/*.json text eol=lf

.github/workflows/build.yml

Lines changed: 22 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,30 @@
1-
# Automatically build the project and run any configured tests for every push
2-
# and submitted pull request. This can help catch issues that only occur on
3-
# certain platforms or Java versions, and provides a first line of defence
4-
# against bad commits.
1+
name: Build
52

6-
name: build
7-
on: [pull_request, push]
3+
on: [push, pull_request]
84

95
jobs:
106
build:
11-
strategy:
12-
matrix:
13-
# Use these Java versions
14-
java: [
15-
17 # Minimum supported by Minecraft
16-
]
17-
# and run on both Linux and not Windows
18-
os: [ubuntu-20.04]
19-
runs-on: ${{ matrix.os }}
7+
runs-on: ubuntu-latest
208
steps:
21-
- name: checkout repository
22-
uses: actions/checkout@v3
23-
- name: validate gradle wrapper
24-
uses: gradle/wrapper-validation-action@v1
25-
- name: setup jdk ${{ matrix.java }}
26-
uses: actions/setup-java@v3
9+
- name: Checkout repository
10+
uses: actions/checkout@v4
2711
with:
12+
fetch-depth: 0
13+
fetch-tags: true
14+
15+
- name: Setup JDK 25
16+
uses: actions/setup-java@v4
17+
with:
18+
java-version: '25'
2819
distribution: 'temurin'
29-
java-version: ${{ matrix.java }}
30-
cache: 'gradle'
31-
- name: make gradle wrapper executable
32-
if: ${{ runner.os != 'Windows' }}
20+
21+
- name: Setup Gradle
22+
uses: gradle/actions/setup-gradle@v4
23+
24+
# This is needed to be able to run ./gradlew below
25+
# You can run `git update-index --chmod +x gradlew` then remove this step.
26+
- name: Make Gradle wrapper executable
3327
run: chmod +x ./gradlew
34-
- name: build
35-
run: ./gradlew build # mergeJars
36-
env:
37-
GITHUB_BUILD_NUMBER: ${{ github.run_number }}
38-
- name: capture fabric's build artifacts
39-
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
40-
uses: actions/upload-artifact@v2
41-
with:
42-
name: Fabric
43-
path: fabric/build/libs/
44-
- name: capture the common build artifacts
45-
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
46-
uses: actions/upload-artifact@v2
47-
with:
48-
name: Common
49-
path: common/build/libs/
50-
- name: capture the merged build artifacts
51-
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
52-
uses: actions/upload-artifact@v2
53-
with:
54-
name: Merged
55-
path: build/libs/merged
56-
- name: capture forge's build artifacts
57-
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
58-
uses: actions/upload-artifact@v2
59-
with:
60-
name: Forge
61-
path: forge/build/libs/
62-
- name: Update Storer
63-
run: java -jar updater/updater.jar
64-
env:
65-
STORER_TYPE: build
66-
JAB125_COM_API_KEY: ${{ secrets.JAB125_COM_API_KEY }}
67-
GITHUB_BUILD_NUMBER: ${{ github.run_number }}
28+
29+
- name: Build with Gradle
30+
run: ./gradlew build

.gitignore

Lines changed: 33 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,40 @@
1-
# User-specific stuff
2-
.idea/*.xml
3-
.idea/*/
4-
!.idea/discord.xml
1+
### Gradle ###
2+
.gradle
3+
build/
4+
!gradle/wrapper/gradle-wrapper.jar
5+
!**/src/**/build/
56

7+
### IntelliJ IDEA ###
8+
.idea/
9+
*.iws
610
*.iml
711
*.ipr
8-
*.iws
9-
10-
# IntelliJ
1112
out/
12-
# mpeltonen/sbt-idea plugin
13-
.idea_modules/
14-
15-
# JIRA plugin
16-
atlassian-ide-plugin.xml
17-
18-
# Compiled class file
19-
*.class
20-
21-
# Log file
22-
*.log
23-
24-
# BlueJ files
25-
*.ctxt
26-
27-
# Package Files #
28-
*.jar
29-
*.war
30-
*.nar
31-
*.ear
32-
*.zip
33-
*.tar.gz
34-
*.rar
35-
36-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
37-
hs_err_pid*
38-
39-
*~
40-
41-
# temporary files which can be created if a process still has a handle open of a deleted file
42-
.fuse_hidden*
43-
44-
# KDE directory preferences
45-
.directory
46-
47-
# Linux trash folder which might appear on any partition or disk
48-
.Trash-*
49-
50-
# .nfs files are created when an open file is removed but is still being accessed
51-
.nfs*
52-
53-
# General
13+
!**/src/**/out/
14+
15+
.run/
16+
17+
### Eclipse ###
18+
.apt_generated
19+
.classpath
20+
.eclipse/
21+
.factorypath
22+
.project
23+
.settings
24+
.springBeans
25+
.sts4-cache
26+
bin/
27+
!**/src/**/bin/
28+
29+
### VS Code ###
30+
.vscode/
31+
32+
### Mac OS ###
5433
.DS_Store
55-
.AppleDouble
56-
.LSOverride
57-
58-
# Icon must end with two \r
59-
Icon
60-
!common/src/main/resources/assets/devices/textures/app/icon
61-
62-
63-
!updater/updater.jar
64-
# Thumbnails
65-
._*
6634

67-
# Files that might appear in the root of a volume
68-
.DocumentRevisions-V100
69-
.fseventsd
70-
.Spotlight-V100
71-
.TemporaryItems
72-
.Trashes
73-
.VolumeIcon.icns
74-
.com.apple.timemachine.donotpresent
75-
76-
# Directories potentially created on remote AFP share
77-
.AppleDB
78-
.AppleDesktop
79-
Network Trash Folder
80-
Temporary Items
81-
.apdisk
82-
83-
# Windows thumbnail cache files
84-
Thumbs.db
85-
Thumbs.db:encryptable
86-
ehthumbs.db
87-
ehthumbs_vista.db
88-
89-
# Dump file
90-
*.stackdump
91-
92-
# Folder config file
93-
[Dd]esktop.ini
94-
95-
# Recycle Bin used on file shares
96-
$RECYCLE.BIN/
97-
98-
# Windows Installer files
99-
*.cab
100-
*.msi
101-
*.msix
102-
*.msm
103-
*.msp
104-
105-
# Windows shortcuts
106-
*.lnk
107-
108-
.gradle
109-
build/
110-
111-
# Ignore Gradle GUI config
112-
gradle-app.setting
113-
114-
# Cache of project
115-
.gradletasknamecache
116-
117-
**/build/
118-
119-
# Common working directory
35+
### Minecraft Modding ###
12036
run/
121-
122-
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
123-
!gradle-wrapper.jar
124-
125-
# Arch
126-
.architectury-transformer
127-
128-
# Avoid ignoring UltranLang main file.
129-
!*.ulan
130-
131-
# Avoid ignoring libraries
132-
!libs/*
133-
134-
# Ignore datagen cache.
135-
/common/src/main/generated/resources/.cache/
37+
!**/src/**/run/
38+
**/src/generated/**/.cache/
39+
repo/
40+
!**/src/**/repo/

README.md

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
# 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)
2-
**Language:** Java
3-
**Minecraft Version:** `1.19.3`, `1.20.1`
4-
**Mod Loader:** [Forge](https://files.minecraftforge.net/), [NeoForge](https://neoforged.net/), [Fabric](https://fabricmc.net/)
5-
**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)
61

7-
*Fork of [MrCrayfish's Device Mod](https://github.com/MrCrayfish/MrCrayfishDeviceMod)*
2+
Installation information
3+
=======
84

9-
## License Notes
10-
Some code is used from other projects with other licenses.
11-
* The package `com.jab125` and all it's subpackages are licensed the GPL 3.0.
12-
* Everything in [updater/](updater) also is licensed under the GPL 3.0.
5+
This template repository can be directly cloned to get you started with a new
6+
mod. Simply create a new repository cloned from this one, by following the
7+
instructions provided by [GitHub](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template).
138

14-
[@MrCrayfish](https://github.com/MrCrayfish) has said on his discord server that we can use his code and even the assets for this port.
9+
Once you have your clone, simply open the repository in the IDE of your choice. The usual recommendation for an IDE is either IntelliJ IDEA or Eclipse.
1510

11+
If at any point you are missing libraries in your IDE, or you've run into problems you can
12+
run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything
13+
{this does not affect your code} and then start the process again.
1614

17-
## Credits
18-
* Thanks to [@MrCrayfish](https://github.com/MrCrayfish) for the original Device Mod.
19-
* Thanks to [@Jab125](https://github.com/Jab125) for helping with porting this mod.
15+
Mapping Names:
16+
============
17+
By default, the MDK is configured to use the official mapping names from Mojang for methods and fields
18+
in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this
19+
license. For the latest license text, refer to the mapping file itself, or the reference copy here:
20+
https://github.com/NeoForged/NeoForm/blob/main/Mojang.md
2021

21-
## Related repos
22-
* [GitWeb Sites](https://github.com/Ultreon/gitweb-sites) (Websites for the GitWeb application)
23-
* [GitWeb Test Sites](https://github.com/Jab125/gitweb-sites) (Testing sites for the GitWeb application)
24-
* [App Certificates](https://github.com/Ultreon/device-mod-certificates) (Certificates for the applications)
22+
Additional Resources:
23+
==========
24+
Community Documentation: https://docs.neoforged.net/
25+
NeoForged Discord: https://discord.neoforged.net/

TEMPLATE_LICENSE.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
MIT License
2+
3+
Copyright (c) 2023 NeoForged project
4+
5+
This license applies to the template files as supplied by github.com/NeoForged/MDK
6+
7+
8+
Permission is hereby granted, free of charge, to any person obtaining a copy
9+
of this software and associated documentation files (the "Software"), to deal
10+
in the Software without restriction, including without limitation the rights
11+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
copies of the Software, and to permit persons to whom the Software is
13+
furnished to do so, subject to the following conditions:
14+
15+
The above copyright notice and this permission notice shall be included in all
16+
copies or substantial portions of the Software.
17+
18+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
24+
SOFTWARE.

0 commit comments

Comments
 (0)