14 Commits
Author SHA1 Message Date
ThePixelMoonandGitHub 87c9733e09 Merge pull request #80 from zukrmn/fix/linux-compiler-warnings
fix: resolve high-severity Linux compiler warnings
2026-03-07 03:23:05 +02:00
zukrmn e3fc6ebe52 fix: resolve high-severity Linux compiler warnings 2026-03-06 22:57:02 +00:00
Leah AndersonandGitHub 41314fa873 Merge pull request #72 from MrShrekThird/dev
Update CONTRIBUTING.md
2026-03-06 11:41:18 -07:00
MrShrekThirdandGitHub 04cadcf953 Removed README.md link lol 2026-03-06 18:37:31 +00:00
MrShrekThirdandGitHub daf43609ca Update CONTRIBUTING.md with README link
Added a note to visit README.md for compilation instructions.
2026-03-06 18:25:52 +00:00
MrShrekThirdandGitHub 42e84f9f4a Update CONTRIBUTING.md
Removed outdated and redundant compilation instructions.
2026-03-06 18:19:13 +00:00
JuiceyDevandGitHub dc57bf5634 Merge pull request #62 from 4jcraft/fix/byte-typealias
fix: remove `byte` type alias
2026-03-06 18:40:36 +01:00
JuiceyDevandGitHub a875a6ef98 Merge pull request #69 from 4jcraft/refactor/optional-llvm-toolchain
refactor(build): make `lld` optional and recommend clang/llvm in README
2026-03-06 18:35:19 +01:00
Tropical 79404297d1 docs: remove mention of discord server unavailability 2026-03-06 11:07:07 -06:00
Tropical 6778dc7f92 refactor(build): make lld optional and recommend clang/llvm in README 2026-03-06 10:26:49 -06:00
Tropical 0dd1654dec docs: undo accidental comment replacement 2026-03-06 05:13:40 -06:00
Tropical b8c4e96409 fix: more replacement mistakes 2026-03-06 05:09:17 -06:00
Tropical 6c56d884e5 fix: undo some mistakes 2026-03-06 05:06:27 -06:00
Tropical 15af35eef2 fix: remove byte type alias 2026-03-06 05:03:37 -06:00
2574 changed files with 732 additions and 805 deletions
+3 -1
View File
@@ -33,7 +33,9 @@ meson-logs/
*.d *.d
compile_commands.json compile_commands.json
# ----- Runtime-created symlinks / scratch -----
# Asset symlink created at runtime for working directory resolution
Common
# ----- Scratch / legacy ----- # ----- Scratch / legacy -----
oldimpl/ oldimpl/
-8
View File
@@ -24,11 +24,3 @@ Simple rules for publishing code:
Make sure your code compiles before making a pull request! and make sure that it's readable Make sure your code compiles before making a pull request! and make sure that it's readable
Remember ALL your changes will be licensed under GNU General Public License V3.0. Remember ALL your changes will be licensed under GNU General Public License V3.0.
## Compiling the project:
> [!NOTE]
> The project is currently in a non-compilable state (as of 3/3/2026)
1. Install CMake, Make, GCC (>= 15.0), G++ (>= 15.0).
2. Create a new directory named build after cloning the repository.
3. Enter the new directory and run `cmake ..` and then run `make`
@@ -104,7 +104,7 @@ void GameRuleManager::loadGameRules(DLCPack *pack)
{ {
DLCGameRulesHeader *dlcHeader = (DLCGameRulesHeader *)pack->getFile(DLCManager::e_DLCType_GameRulesHeader, i); DLCGameRulesHeader *dlcHeader = (DLCGameRulesHeader *)pack->getFile(DLCManager::e_DLCType_GameRulesHeader, i);
DWORD dSize; DWORD dSize;
byte *dData = dlcHeader->getData(dSize); uint8_t *dData = dlcHeader->getData(dSize);
LevelGenerationOptions *createdLevelGenerationOptions = new LevelGenerationOptions(); LevelGenerationOptions *createdLevelGenerationOptions = new LevelGenerationOptions();
// = loadGameRules(dData, dSize); //, strings); // = loadGameRules(dData, dSize); //, strings);
@@ -126,7 +126,7 @@ void GameRuleManager::loadGameRules(DLCPack *pack)
DLCGameRulesFile *dlcFile = (DLCGameRulesFile *)pack->getFile(DLCManager::e_DLCType_GameRules, i); DLCGameRulesFile *dlcFile = (DLCGameRulesFile *)pack->getFile(DLCManager::e_DLCType_GameRules, i);
DWORD dSize; DWORD dSize;
byte *dData = dlcFile->getData(dSize); uint8_t *dData = dlcFile->getData(dSize);
LevelGenerationOptions *createdLevelGenerationOptions = new LevelGenerationOptions(); LevelGenerationOptions *createdLevelGenerationOptions = new LevelGenerationOptions();
// = loadGameRules(dData, dSize); //, strings); // = loadGameRules(dData, dSize); //, strings);
@@ -142,7 +142,7 @@ void GameRuleManager::loadGameRules(DLCPack *pack)
} }
} }
LevelGenerationOptions *GameRuleManager::loadGameRules(byte *dIn, UINT dSize) LevelGenerationOptions *GameRuleManager::loadGameRules(uint8_t *dIn, UINT dSize)
{ {
LevelGenerationOptions *lgo = new LevelGenerationOptions(); LevelGenerationOptions *lgo = new LevelGenerationOptions();
lgo->setGrSource( new JustGrSource() ); lgo->setGrSource( new JustGrSource() );
@@ -153,7 +153,7 @@ LevelGenerationOptions *GameRuleManager::loadGameRules(byte *dIn, UINT dSize)
} }
// 4J-JEV: Reverse of saveGameRules. // 4J-JEV: Reverse of saveGameRules.
void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, byte *dIn, UINT dSize) void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, UINT dSize)
{ {
app.DebugPrintf("GameRuleManager::LoadingGameRules:\n"); app.DebugPrintf("GameRuleManager::LoadingGameRules:\n");
@@ -240,7 +240,7 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, byte *dIn, UINT
} }
// 4J-JEV: Reverse of loadGameRules. // 4J-JEV: Reverse of loadGameRules.
void GameRuleManager::saveGameRules(byte **dOut, UINT *dSize) void GameRuleManager::saveGameRules(uint8_t **dOut, UINT *dSize)
{ {
if (m_currentGameRuleDefinitions == NULL && if (m_currentGameRuleDefinitions == NULL &&
m_currentLevelGenerationOptions == NULL) m_currentLevelGenerationOptions == NULL)
@@ -373,7 +373,7 @@ void GameRuleManager::writeRuleFile(DataOutputStream *dos)
m_currentGameRuleDefinitions->write(dos); m_currentGameRuleDefinitions->write(dos);
} }
bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT dSize, StringTable *strings) //(DLCGameRulesFile *dlcFile, StringTable *strings) bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, UINT dSize, StringTable *strings) //(DLCGameRulesFile *dlcFile, StringTable *strings)
{ {
bool levelGenAdded = false; bool levelGenAdded = false;
bool gameRulesAdded = false; bool gameRulesAdded = false;
@@ -40,10 +40,10 @@ public:
void loadGameRules(DLCPack *); void loadGameRules(DLCPack *);
LevelGenerationOptions *loadGameRules(byte *dIn, UINT dSize); LevelGenerationOptions *loadGameRules(uint8_t *dIn, UINT dSize);
void loadGameRules(LevelGenerationOptions *lgo, byte *dIn, UINT dSize); void loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, UINT dSize);
void saveGameRules(byte **dOut, UINT *dSize); void saveGameRules(uint8_t **dOut, UINT *dSize);
private: private:
LevelGenerationOptions *readHeader(DLCGameRulesHeader *grh); LevelGenerationOptions *readHeader(DLCGameRulesHeader *grh);
@@ -51,7 +51,7 @@ private:
void writeRuleFile(DataOutputStream *dos); void writeRuleFile(DataOutputStream *dos);
public: public:
bool readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT dSize, StringTable *strings); //(DLCGameRulesFile *dlcFile, StringTable *strings); bool readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, UINT dSize, StringTable *strings); //(DLCGameRulesFile *dlcFile, StringTable *strings);
private: private:
void readAttributes(DataInputStream *dis, vector<wstring> *tagsAndAtts, GameRuleDefinition *rule); void readAttributes(DataInputStream *dis, vector<wstring> *tagsAndAtts, GameRuleDefinition *rule);

Some files were not shown because too many files have changed in this diff Show More