2023-03-15 21:52:13 +00:00
|
|
|
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
|
|
|
Source: https://github.com/cc-tweaked/cc-tweaked
|
|
|
|
Upstream-Name: CC: Tweaked
|
|
|
|
Upstream-Contact: Jonathan Coates <git@squiddev.cc>
|
|
|
|
|
|
|
|
Files:
|
|
|
|
projects/common/src/main/resources/assets/computercraft/sounds.json
|
|
|
|
projects/common/src/main/resources/assets/computercraft/sounds/empty.ogg
|
2023-07-06 21:26:39 +00:00
|
|
|
projects/common/src/testMod/resources/data/cctest/computercraft/turtle_upgrades/*
|
2023-03-15 21:52:13 +00:00
|
|
|
projects/common/src/testMod/resources/data/cctest/structures/*
|
Move shared generated resources to common project
In 1.20.1, Forge and Fabric have different "common" tag conventions (for
instance, Forge uses forge:dusts/redstone, while Fabric uses
c:redstone_dusts). This means the generated recipes (and advancements)
will be different for the two loader projects. As such, we run data
generators for each loader, and store the results separately.
However, aside from some recipes and advancements, most resources /are/
the same between the two. This means we end up with a lot of duplicate
files, which make the diff even harder to read. This gets worse in
1.20.5, when NeoForge and Fabric have (largely) unified their tag names.
This commit now merges the generated resources of the two loaders,
moving shared files to the common project.
- Add a new MergeTrees command, to handle the de-duplication of files.
- Change the existing runData tasks to write to
build/generatedResources.
- Add a new :common:runData task, that reads from the
build/generatedResources folder and writes to the per-project
src/generated/resources.
2024-04-26 16:59:24 +00:00
|
|
|
projects/*/src/generated/*
|
2023-09-28 20:00:00 +00:00
|
|
|
projects/web/src/htmlTransform/export/index.json
|
|
|
|
projects/web/src/htmlTransform/export/items/minecraft/*
|
2023-03-15 21:52:13 +00:00
|
|
|
Comment: Generated/data files are CC0.
|
|
|
|
Copyright: The CC: Tweaked Developers
|
|
|
|
License: CC0-1.0
|
|
|
|
|
|
|
|
Files:
|
2023-05-24 21:32:46 +00:00
|
|
|
doc/images/*
|
2023-03-15 21:52:13 +00:00
|
|
|
package.json
|
|
|
|
package-lock.json
|
|
|
|
projects/common/src/client/resources/computercraft-client.mixins.json
|
|
|
|
projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.json
|
|
|
|
projects/common/src/main/resources/computercraft.mixins.json
|
|
|
|
projects/common/src/testMod/resources/computercraft-gametest.mixins.json
|
|
|
|
projects/common/src/testMod/resources/data/computercraft/loot_tables/treasure_disk.json
|
|
|
|
projects/common/src/testMod/resources/pack.mcmeta
|
2023-05-24 21:32:46 +00:00
|
|
|
projects/core/src/main/resources/data/computercraft/lua/rom/modules/command/.ignoreme
|
|
|
|
projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/.ignoreme
|
|
|
|
projects/core/src/main/resources/data/computercraft/lua/rom/modules/turtle/.ignoreme
|
|
|
|
projects/core/src/main/resources/data/computercraft/lua/rom/motd.txt
|
2023-03-15 21:52:13 +00:00
|
|
|
projects/fabric-api/src/main/modJson/fabric.mod.json
|
|
|
|
projects/fabric/src/client/resources/computercraft-client.fabric.mixins.json
|
|
|
|
projects/fabric/src/main/resources/computercraft.fabric.mixins.json
|
|
|
|
projects/fabric/src/main/resources/fabric.mod.json
|
|
|
|
projects/fabric/src/testMod/resources/computercraft-gametest.fabric.mixins.json
|
|
|
|
projects/fabric/src/testMod/resources/fabric.mod.json
|
|
|
|
projects/forge/src/client/resources/computercraft-client.forge.mixins.json
|
2023-09-28 20:00:00 +00:00
|
|
|
projects/web/src/frontend/mount/.settings
|
|
|
|
projects/web/src/frontend/mount/example.nfp
|
|
|
|
projects/web/src/frontend/mount/example.nft
|
|
|
|
projects/web/src/frontend/mount/expr_template.lua
|
2023-03-15 21:52:13 +00:00
|
|
|
projects/web/tsconfig.json
|
|
|
|
Comment: Several assets where it's inconvenient to create a .license file.
|
|
|
|
Copyright: The CC: Tweaked Developers
|
|
|
|
License: MPL-2.0
|
|
|
|
|
|
|
|
Files:
|
|
|
|
doc/logo.png
|
2023-07-18 19:26:45 +00:00
|
|
|
doc/logo-darkmode.png
|
2023-03-15 21:52:13 +00:00
|
|
|
projects/common/src/main/resources/assets/computercraft/models/*
|
|
|
|
projects/common/src/main/resources/assets/computercraft/textures/*
|
|
|
|
projects/common/src/main/resources/pack.mcmeta
|
|
|
|
projects/common/src/main/resources/pack.png
|
Add a standalone CC:T UI
Does it count as an emulator when it's official? I hope not, as this'd
make it my fourth or fifth emulator at this point.
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Developing/debugging CraftOS is a massive pain to do inside Minecraft,
as any change to resources requires a compile+hot swap cycle (and
sometimes a `/reload` in-game). As such, it's often more convenient to
spin up an emulator, pointing it to load the ROM from CC:T's sources.
However, this isn't practical when also making changes to the Java
classes. In this case, we either need to go in-game, or build a custom
version of CCEmuX.
This commit offers an alternative option: we now have our own emulator,
which allows us to hot swap both Lua and Java to our heart's content.
Most of the code here is based on our monitor TBO renderer. We probably
could share some more of this, but there's not really a good place for
it - feels a bit weird just to chuck it in :core.
This is *not* a general-purpose emulator. It's limited in a lot of
ways (won't launch on Mac[^1], no support for multiple computers) - just
stick to what's there already.
[^1]: We require OpenGL 4.5 due to our use of DSA.
2023-10-28 16:55:56 +00:00
|
|
|
projects/core/src/main/resources/assets/computercraft/textures/gui/term_font.png
|
2023-03-15 21:52:13 +00:00
|
|
|
projects/core/src/main/resources/data/computercraft/lua/rom/autorun/.ignoreme
|
|
|
|
projects/core/src/main/resources/data/computercraft/lua/rom/help/*
|
|
|
|
projects/core/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/levels/*
|
2023-09-28 20:00:00 +00:00
|
|
|
projects/web/src/htmlTransform/export/items/computercraft/*
|
2023-03-15 21:52:13 +00:00
|
|
|
Comment: Bulk-license original assets as CCPL.
|
|
|
|
Copyright: 2011 Daniel Ratcliffe
|
|
|
|
License: LicenseRef-CCPL
|
|
|
|
|
Further licensing work
- Fix several inaccuracies with several files not marking Dan's
authorship. Most of these are new files, where the code was moved from
somewhere else:
- In the public API: IDynamicLuaObject, ILuaAPI, TaskCallbakc,
IDynamicPeripheral, UpgradeBase
- In the ROM: fs, http, require
- Do not mark Dan as an author for entirely new code. This affects
DetailHelpers, DropConsumer, FluidData, InventoryMethods, ItemDetails,
MonitorRenderState, NoTermComputerScreen, Palette, PlatformHelperImpl,
UploadFileMessage, the Terminal tests, and any speaker-related files.
- Relicence many files under the MPL where we have permission to do
so. See #1339 for further details.
Thank you to everyone who has contributed so far! Cannot overstate how
appreciated it is <3.
2023-03-29 21:48:57 +00:00
|
|
|
Files:
|
2023-10-16 21:12:41 +00:00
|
|
|
projects/common/src/main/resources/assets/computercraft/lang/cs_cz.json
|
|
|
|
projects/common/src/main/resources/assets/computercraft/lang/ko_kr.json
|
|
|
|
projects/common/src/main/resources/assets/computercraft/lang/pl_pl.json
|
|
|
|
projects/common/src/main/resources/assets/computercraft/lang/pt_br.json
|
|
|
|
projects/common/src/main/resources/assets/computercraft/lang/ru_ru.json
|
|
|
|
projects/common/src/main/resources/assets/computercraft/lang/uk_ua.json
|
|
|
|
projects/common/src/main/resources/assets/computercraft/lang/zh_cn.json
|
Further licensing work
- Fix several inaccuracies with several files not marking Dan's
authorship. Most of these are new files, where the code was moved from
somewhere else:
- In the public API: IDynamicLuaObject, ILuaAPI, TaskCallbakc,
IDynamicPeripheral, UpgradeBase
- In the ROM: fs, http, require
- Do not mark Dan as an author for entirely new code. This affects
DetailHelpers, DropConsumer, FluidData, InventoryMethods, ItemDetails,
MonitorRenderState, NoTermComputerScreen, Palette, PlatformHelperImpl,
UploadFileMessage, the Terminal tests, and any speaker-related files.
- Relicence many files under the MPL where we have permission to do
so. See #1339 for further details.
Thank you to everyone who has contributed so far! Cannot overstate how
appreciated it is <3.
2023-03-29 21:48:57 +00:00
|
|
|
Comment: Community-contributed license files
|
|
|
|
Copyright: 2017 The CC: Tweaked Developers
|
|
|
|
License: LicenseRef-CCPL
|
|
|
|
|
2023-10-16 21:12:41 +00:00
|
|
|
Files:
|
|
|
|
projects/common/src/main/resources/assets/computercraft/lang/*
|
|
|
|
Comment: Community-contributed license files
|
|
|
|
Copyright: 2017 The CC: Tweaked Developers
|
|
|
|
License: MPL-2.0
|
|
|
|
|
2023-03-15 21:52:13 +00:00
|
|
|
Files:
|
|
|
|
.github/*
|
|
|
|
Comment:
|
|
|
|
GitHub build scripts are CC0. While we could add a header to each file,
|
|
|
|
it's unclear if it will break actions or issue templates in some way.
|
|
|
|
Copyright: Jonathan Coates <git@squiddev.cc>
|
|
|
|
License: CC0-1.0
|
|
|
|
|
|
|
|
Files:
|
|
|
|
gradle/wrapper/*
|
|
|
|
gradlew
|
|
|
|
gradlew.bat
|
|
|
|
Copyright: Gradle Inc
|
|
|
|
License: Apache-2.0
|
|
|
|
|
|
|
|
Files: projects/core/src/test/resources/test-rom/data/json-parsing/*
|
|
|
|
Copyright: 2016 Nicolas Seriot
|
|
|
|
License: MIT
|