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

1.20.1 dev #5

Merged
merged 98 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
f6fa80a
Added creative mode tab
MisterJulsen Feb 27, 2024
4d766ba
Updated version
MisterJulsen Feb 27, 2024
f37f4d9
Updated version
MisterJulsen Feb 27, 2024
a10d2d5
Updated registry
MisterJulsen Mar 18, 2024
a3be94e
Added item descriptions
MisterJulsen Mar 18, 2024
02e834b
Added new advanced display blocks
MisterJulsen Mar 18, 2024
cc0e1fc
Added new display type
MisterJulsen Mar 18, 2024
af470d9
Fixed small bugs
MisterJulsen Mar 18, 2024
0ec5910
Fixed: Search settings scroll input does not play sound
MisterJulsen Mar 19, 2024
da7f2a8
Updated displays
MisterJulsen Mar 19, 2024
a2f4451
Added: Display boards can now render back side
MisterJulsen Mar 20, 2024
366cc00
Added new translations
MisterJulsen Mar 20, 2024
6adb108
Fixed exit direction on dieplays with both sides
MisterJulsen Mar 20, 2024
87368e0
Display can now be higher than 1 block
MisterJulsen Mar 20, 2024
8a2363d
New display connection code (test)
MisterJulsen Mar 20, 2024
7926165
Fixed display connection
MisterJulsen Mar 21, 2024
ae679f7
Updated display connection
MisterJulsen Mar 21, 2024
9c5be12
Finished display connections
MisterJulsen Mar 22, 2024
fb35333
Updated display connection
MisterJulsen Mar 22, 2024
312d469
Fixed some bugs in displays
MisterJulsen Mar 22, 2024
af01829
Increased max display size
MisterJulsen Mar 24, 2024
16c3cb9
Removed old code
MisterJulsen Mar 24, 2024
731e41b
Changed code formatting
MisterJulsen Mar 24, 2024
e889814
Fixed client sync
MisterJulsen Mar 24, 2024
2326493
Fixed unnecessary update calls
MisterJulsen Mar 24, 2024
c4c9080
Cleanup
MisterJulsen Mar 24, 2024
bd5f870
Added train prediction data
MisterJulsen Mar 24, 2024
b8efc0c
Updated visual connection code
MisterJulsen Mar 24, 2024
e076f54
Code reorganized
MisterJulsen Mar 24, 2024
76473d1
Support for multiple texts in the same label
MisterJulsen Mar 24, 2024
f799dd4
Renamed translation
MisterJulsen Mar 24, 2024
e76451a
Added data source
MisterJulsen Mar 24, 2024
cd5a22f
Updated gitignore
MisterJulsen Mar 24, 2024
a841f8a
Added new platform display type
MisterJulsen Mar 24, 2024
aecd382
Added new platform display type
MisterJulsen Mar 25, 2024
67394bf
Updated displays
MisterJulsen Mar 26, 2024
4bea73f
Updated translation
MisterJulsen Mar 26, 2024
cd6e8c1
Updated display
MisterJulsen Mar 27, 2024
151f6e1
Added train station clock
MisterJulsen Mar 27, 2024
aaf8cf5
Merge branch '1.18.2-dev' of https://github.com/MisterJulsen/Create-T…
MisterJulsen Mar 27, 2024
75dbdf8
Added train station clock
MisterJulsen Mar 29, 2024
b5e20f2
Added informative passenger display
MisterJulsen Mar 29, 2024
68ece45
Removed debug comment
MisterJulsen Mar 29, 2024
3c0592e
Removed unused file
MisterJulsen Mar 31, 2024
2cb3319
Fixed BER text lighting
MisterJulsen Mar 31, 2024
b856fed
Added cullfaces
MisterJulsen Mar 31, 2024
9d433b5
Added block drops
MisterJulsen Mar 31, 2024
e998a58
Added crafting recipes
MisterJulsen Mar 31, 2024
208bf36
Navigator recipe now using tags
MisterJulsen Mar 31, 2024
f2ee89e
Added advanced display block tag
MisterJulsen Mar 31, 2024
2c40fbf
Added block mineable tag
MisterJulsen Mar 31, 2024
0b4e670
Removed placement helpers as they didn't work correctly
MisterJulsen Mar 31, 2024
942208e
Added all display variants to ponder
MisterJulsen Mar 31, 2024
4d24a3b
Fixed block sync
MisterJulsen Mar 31, 2024
88d81b6
Small display improvements
MisterJulsen Mar 31, 2024
5ce0389
Fixed text not rendering
MisterJulsen Mar 31, 2024
8852814
Added global settings button to display settings screen
MisterJulsen Mar 31, 2024
320f910
Remove placeholder value
MisterJulsen Mar 31, 2024
371ff99
Removed debug text
MisterJulsen Mar 31, 2024
2363d82
vscode settings
MisterJulsen Mar 31, 2024
67501a5
Added missing registry tags
MisterJulsen Mar 31, 2024
58aeb50
Removed unused imports
MisterJulsen Mar 31, 2024
be12dd5
Added tooltips
MisterJulsen Mar 31, 2024
e8640a1
Removed unused code
MisterJulsen Mar 31, 2024
f83cbc6
Updated advancements
MisterJulsen Apr 2, 2024
96507c1
Blacklisted stations are filtered by default
MisterJulsen Apr 2, 2024
0175862
Fixed: Stopovers are wrong
MisterJulsen Apr 2, 2024
a26e3d7
Added custom display link mode
MisterJulsen Apr 2, 2024
899588a
Removed unused imports
MisterJulsen Apr 2, 2024
63ba1f3
Fixed client/server sync
MisterJulsen Apr 2, 2024
69e52b3
Fixed: Displays do not copy SIDE property
MisterJulsen Apr 2, 2024
0a0cf32
Fixed: client data sync
MisterJulsen Apr 2, 2024
682344a
Updated display link option registry
MisterJulsen Apr 2, 2024
af0464e
Fixed: Next connections are not sorted correctly
MisterJulsen Apr 3, 2024
9d0b6e7
Fixed small display block connection
MisterJulsen Apr 3, 2024
0b83de0
Fixed: Displays do not update correctly if no data is available
MisterJulsen Apr 3, 2024
3bddd66
Added additional data
MisterJulsen Apr 3, 2024
cb51f13
Lighting fix
MisterJulsen Apr 3, 2024
5b47585
Updated display layout
MisterJulsen Apr 3, 2024
7c57024
Fixed sorting
MisterJulsen Apr 3, 2024
acae048
Updated network version
MisterJulsen Apr 3, 2024
a280209
Test model
MisterJulsen Apr 3, 2024
a1e6c03
Added new config option
MisterJulsen Apr 3, 2024
0a4c9a1
Fixed translations
MisterJulsen Apr 3, 2024
d509825
Fixed item tags
MisterJulsen Apr 3, 2024
745a3b3
Added german translations
MisterJulsen Apr 3, 2024
a03c82b
Fixed font rendering
MisterJulsen Apr 4, 2024
0cda3ab
vscode settings
MisterJulsen Apr 4, 2024
3189f87
Update gitignore
MisterJulsen Apr 4, 2024
ff5929e
Merge remote-tracking branch 'origin/1.18.2-dev' into 1.19.2-dev
MisterJulsen Apr 4, 2024
d78ab8c
1.19.2 Port
MisterJulsen Apr 4, 2024
9640676
Fixed random freeze
MisterJulsen Apr 4, 2024
018ea12
Hopefully fixed ConcurrentModificationException
MisterJulsen Apr 4, 2024
7fe16a0
Merge remote-tracking branch 'origin/1.19.2-dev' into 1.20.1-dev
MisterJulsen Apr 4, 2024
b69aa5a
1.20 Port
MisterJulsen Apr 4, 2024
03f6df8
Default platform width is now AUTO
MisterJulsen Apr 4, 2024
76db978
Max lines set to 1
MisterJulsen Apr 4, 2024
0c7cc75
Updated translations
MisterJulsen Apr 5, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ bin
.metadata
.classpath
.project
.vscode

# idea
out
Expand Down
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"projectName": "CRN 1.20.1",
"cwd": "${workspaceFolder}\\run",
"vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build\\classpath\\runClient_minecraftClasspath.txt\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build/createSrgToMcp/output.srg\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dforge.enabledGameTestNamespaces\u003dcreaterailwaysnavigator -Dforge.enableGameTest\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.10\\51e6a22c6c716beb11e244bf5b8be480f51dd6b5\\securejarhandler-2.1.10.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.5\\19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0\\asm-commons-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.5\\64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe\\asm-util-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.5\\490bacc77de7cbc0be1a30bb3471072d705be4a4\\asm-analysis-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.5\\fd33c8b6373abaa675be407082fdfda35021254a\\asm-tree-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.5\\dc6ea1875f4d64fbc85e1691c95b96a3d8569c90\\asm-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming -XX:HeapDumpPath\u003dMojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump",
"args": "--launchTarget forgeclientuserdev --version MOD_DEV --assetIndex 5 --assetsDir C:\\Users\\julia\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 47.2.0 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --mixin.config createrailwaysnavigator.mixin.json",
"args": "--launchTarget forgeclientuserdev --version MOD_DEV --assetIndex 5 --assetsDir C:\\Users\\julia\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 47.2.0 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --mixin.config createrailwaysnavigator.mixins.json",
"env": {
"MOD_CLASSES": "createrailwaysnavigator%%${workspaceFolder}\\build\\resources\\main;createrailwaysnavigator%%${workspaceFolder}\\build\\classes\\java\\main",
"MCP_MAPPINGS": "parchment_2023.09.03-1.20.1"
Expand All @@ -24,7 +24,7 @@
"projectName": "CRN 1.20.1",
"cwd": "${workspaceFolder}\\run-data",
"vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build\\classpath\\runData_minecraftClasspath.txt\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build/createSrgToMcp/output.srg\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.10\\51e6a22c6c716beb11e244bf5b8be480f51dd6b5\\securejarhandler-2.1.10.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.5\\19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0\\asm-commons-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.5\\64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe\\asm-util-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.5\\490bacc77de7cbc0be1a30bb3471072d705be4a4\\asm-analysis-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.5\\fd33c8b6373abaa675be407082fdfda35021254a\\asm-tree-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.5\\dc6ea1875f4d64fbc85e1691c95b96a3d8569c90\\asm-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming",
"args": "--launchTarget forgedatauserdev --assetIndex 5 --assetsDir C:\\Users\\julia\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 47.2.0 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --mod createrailwaysnavigator --all --output \"C:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\src\\generated\\resources\" --existing \"C:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\src\\main\\resources\" --mixin.config createrailwaysnavigator.mixin.json",
"args": "--launchTarget forgedatauserdev --assetIndex 5 --assetsDir C:\\Users\\julia\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 47.2.0 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --mod createrailwaysnavigator --all --output \"C:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\src\\generated\\resources\" --existing \"C:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\src\\main\\resources\" --mixin.config createrailwaysnavigator.mixins.json",
"env": {
"MOD_CLASSES": "createrailwaysnavigator%%${workspaceFolder}\\build\\resources\\main;createrailwaysnavigator%%${workspaceFolder}\\build\\classes\\java\\main",
"MCP_MAPPINGS": "parchment_2023.09.03-1.20.1"
Expand All @@ -39,7 +39,7 @@
"projectName": "CRN 1.20.1",
"cwd": "${workspaceFolder}\\run",
"vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build\\classpath\\runGameTestServer_minecraftClasspath.txt\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build/createSrgToMcp/output.srg\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dforge.enabledGameTestNamespaces\u003dcreaterailwaysnavigator -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.10\\51e6a22c6c716beb11e244bf5b8be480f51dd6b5\\securejarhandler-2.1.10.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.5\\19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0\\asm-commons-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.5\\64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe\\asm-util-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.5\\490bacc77de7cbc0be1a30bb3471072d705be4a4\\asm-analysis-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.5\\fd33c8b6373abaa675be407082fdfda35021254a\\asm-tree-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.5\\dc6ea1875f4d64fbc85e1691c95b96a3d8569c90\\asm-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming",
"args": "--launchTarget forgegametestserveruserdev --gameDir . --fml.forgeVersion 47.2.0 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --mixin.config createrailwaysnavigator.mixin.json",
"args": "--launchTarget forgegametestserveruserdev --gameDir . --fml.forgeVersion 47.2.0 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --mixin.config createrailwaysnavigator.mixins.json",
"env": {
"MOD_CLASSES": "createrailwaysnavigator%%${workspaceFolder}\\build\\resources\\main;createrailwaysnavigator%%${workspaceFolder}\\build\\classes\\java\\main",
"MCP_MAPPINGS": "parchment_2023.09.03-1.20.1"
Expand All @@ -54,7 +54,7 @@
"projectName": "CRN 1.20.1",
"cwd": "${workspaceFolder}\\run",
"vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build\\classpath\\runServer_minecraftClasspath.txt\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build/createSrgToMcp/output.srg\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\julia\\Documents\\Forge Modding\\CreateRailwaysNavigator\\CRN 1.20.1\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dforge.enabledGameTestNamespaces\u003dcreaterailwaysnavigator -Dforge.enableGameTest\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.10\\51e6a22c6c716beb11e244bf5b8be480f51dd6b5\\securejarhandler-2.1.10.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.5\\19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0\\asm-commons-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.5\\64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe\\asm-util-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.5\\490bacc77de7cbc0be1a30bb3471072d705be4a4\\asm-analysis-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.5\\fd33c8b6373abaa675be407082fdfda35021254a\\asm-tree-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.5\\dc6ea1875f4d64fbc85e1691c95b96a3d8569c90\\asm-9.5.jar;C:\\Users\\julia\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming",
"args": "--launchTarget forgeserveruserdev --gameDir . --fml.forgeVersion 47.2.0 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --nogui --mixin.config createrailwaysnavigator.mixin.json",
"args": "--launchTarget forgeserveruserdev --gameDir . --fml.forgeVersion 47.2.0 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --nogui --mixin.config createrailwaysnavigator.mixins.json",
"env": {
"MOD_CLASSES": "createrailwaysnavigator%%${workspaceFolder}\\build\\resources\\main;createrailwaysnavigator%%${workspaceFolder}\\build\\classes\\java\\main",
"MCP_MAPPINGS": "parchment_2023.09.03-1.20.1"
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"java.configuration.updateBuildConfiguration": "automatic",
"java.compile.nullAnalysis.mode": "disabled"
"java.compile.nullAnalysis.mode": "disabled",
"commentTranslate.hover.enabled": false
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
org.gradle.jvmargs=-Xmx6G
org.gradle.daemon=false

mod_version = 0.3.0-beta
mod_version = 0.4.0-beta
mod_root_path = de.mrjulsen.crn

minecraft_version=1.20.1
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/de/mrjulsen/crn/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.UUID;

import com.google.gson.Gson;

Expand All @@ -21,10 +22,11 @@ public class Constants {
public static final Component TEXT_TRUE = Utils.translate("gui." + ModMain.MOD_ID + ".common.true");
public static final Component TEXT_FALSE = Utils.translate("gui." + ModMain.MOD_ID + ".common.false");
public static final Component TEXT_SERVER_ERROR = Utils.translate("gui." + ModMain.MOD_ID + ".common.server_error");
public static final String TEXT_SEARCH = Utils.translate("common." + ModMain.MOD_ID + ".search").getString();
public static final Component TEXT_SEARCH = Utils.translate("gui." + ModMain.MOD_ID + ".common.search");
public static final Gson GSON = new Gson();
public static final DateFormat DATE_FORMAT = new SimpleDateFormat();
public static final int TIME_SHIFT = 6000;
public static final UUID ZERO_UUID = UUID.fromString("00000000-0000-0000-0000-000000000000");

public static final int COLOR_ON_TIME = 0x1AEA5F;
public static final int COLOR_DELAYED = 0xFF4242;
Expand Down
54 changes: 46 additions & 8 deletions src/main/java/de/mrjulsen/crn/ModMain.java
Original file line number Diff line number Diff line change
@@ -1,42 +1,80 @@
package de.mrjulsen.crn;

import com.mojang.logging.LogUtils;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.foundation.item.ItemDescription;
import com.simibubi.create.foundation.item.KineticStats;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipModifier;

import de.mrjulsen.crn.block.AdvancedDisplayBlock;
import de.mrjulsen.crn.config.ModClientConfig;
import de.mrjulsen.crn.config.ModCommonConfig;
import de.mrjulsen.crn.item.ModItems;
import de.mrjulsen.crn.item.creativemodetab.ModCreativeModeTab;
import de.mrjulsen.crn.network.NetworkManager;
import de.mrjulsen.crn.proxy.ClientInitWrapper;
import de.mrjulsen.crn.proxy.ServerInit;
import de.mrjulsen.crn.registry.ModBlockEntities;
import de.mrjulsen.crn.registry.ModBlocks;
import de.mrjulsen.crn.registry.ModCreativeModeTab;
import de.mrjulsen.crn.registry.ModExtras;
import de.mrjulsen.crn.registry.ModItems;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;

import javax.annotation.Nullable;

import org.slf4j.Logger;

@Mod(ModMain.MOD_ID)
public final class ModMain {

// The value here should match an entry in the META-INF/mods.toml file
public static final String MOD_ID = "createrailwaysnavigator";

// Directly reference a slf4j logger
public static final Logger LOGGER = LogUtils.getLogger();

public static final CreateRegistrate REGISTRATE = CreateRegistrate.create(MOD_ID);

@Nullable
public static KineticStats create(Item item) {
if (item instanceof BlockItem blockItem) {
Block block = blockItem.getBlock();
if (block instanceof AdvancedDisplayBlock) {
return new KineticStats(block);
}
}
return null;
}

static {
ModMain.REGISTRATE.setTooltipModifierFactory(item ->
new ItemDescription.Modifier(item, TooltipHelper.Palette.STANDARD_CREATE)
.andThen(TooltipModifier.mapNull(ModMain.create(item)))
);
}

public ModMain() {
IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
eventBus.addListener(ServerInit::setup);
eventBus.addListener(ClientInitWrapper::setup);

ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ModClientConfig.SPEC, MOD_ID + "-client.toml");
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ModCommonConfig.SPEC, MOD_ID + "-common.toml");

ModItems.register(eventBus);
eventBus.addListener(ServerInit::setup);
eventBus.addListener(ClientInitWrapper::setup);

REGISTRATE.registerEventListeners(eventBus);

ModBlocks.register();
ModItems.register();
ModBlockEntities.register();
ModCreativeModeTab.register(eventBus);
NetworkManager.create();
ModExtras.register();
MinecraftForge.EVENT_BUS.register(this);
}
}
Loading