Missing dlc ids for ck3

.github/ISSUE_TEMPLATE/game-not-working.md

@@ -0,0 +1,25 @@
+---
+name: Game not working
+about: Report a game not working with creamlinux
+title: GAME NAME not working
+labels: bug
+assignees: anticitizn
+
+---
+
+**Game Name**: 
+
+
+**Issue**:
+- [  ] Game does not launch
+- [  ] Game launches but DLCs are not enabled
+
+**Logs**:
+Please provide the complete logs according to instructions in the [readme](https://github.com/anticitizn/creamlinux/blob/master/README.md):
+
+
+**Game Directory*:
+Please provide an overview of your game directory using `ls -lh; ls -lh */`:
+
+
+**Additional Information**:

.github/workflows/cmake.yml

@@ -0,0 +1,82 @@
+name: CMake
+
+on:
+  workflow_dispatch:
+    inputs:
+      relName:
+        description: 'Release Name'     
+        required: true
+        default: 'Release v1.0.0'
+      tagName:
+        description: 'Release tag'  
+        required: true
+        default: ""
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+    # You can convert this to a matrix build if you need cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Init and update submodules
+      run: | 
+        git submodule init
+        git submodule update
+    - name: Install gcc-multilib, g++-multilib
+      run: sudo apt-get install -y gcc-multilib g++-multilib
+
+    - name: Build
+      # Build your program with the given configuration
+      run: |
+         chmod +x ./build.sh
+         ./build.sh
+      shell: bash
+
+    - name: Create artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: linux-artifacts
+        path: |
+          ${{github.workspace}}/output
+    - name: Create Release
+      id: create_release
+      if: ${{ github.event_name == 'workflow_dispatch'}}
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+      with:
+        tag_name: ${{ github.event.inputs.tagName }}
+        release_name: ${{ github.event.inputs.relName }}
+        body: ""
+        draft: false
+        prerelease: false
+    - name: Create zip of compile outputs
+      uses: papeloto/action-zip@v1
+      if: ${{ github.event_name == 'workflow_dispatch'}}
+      with:
+        files: output
+        dest: creamlinux.zip
+    - name: Upload Release Assets
+      if: ${{ github.event_name == 'workflow_dispatch'}}
+      id: upload-release-asset 
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+        asset_path: ./creamlinux.zip
+        asset_name: creamlinux.zip
+        asset_content_type: application/zip
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      # Execute tests defined by the CMake configuration.  
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest -C ${{env.BUILD_TYPE}}
+

.gitignore

@@ -2,3 +2,6 @@ build/
 .cache
 .vscode
 lib/
+output
+.idea
+cmake-build-debug/

CMakeLists.txt

@@ -2,25 +2,37 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
 
 PROJECT(Creamlinux)
-SET(CMAKE_CXX_STANDARD 17) # no explicit compiler flags if possible
+SET(CMAKE_CXX_STANDARD 14) # no explicit compiler flags if possible
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-SET(CMAKE_BUILD_TYPE Debug)
-SET (DEBUG true)
 
 link_directories(${CMAKE_SOURCE_DIR}/lib)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 
 ADD_LIBRARY(Creamlinux SHARED
 	${CMAKE_SOURCE_DIR}/main.cpp
-	${CMAKE_SOURCE_DIR}/steam
+	# ${CMAKE_SOURCE_DIR}/ext/steam
 	# ${CMAKE_SOURCE_DIR}/Creamlinux_steamapps.cpp
 )
+message("CMAKE_SIZEOF_VOID_P is ${CMAKE_SIZEOF_VOID_P}")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    # 64 bits
+    set(CMAKE_SHARED_LIBRARY_PREFIX "lib64")
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    # 32 bits
+    set(CMAKE_SHARED_LIBRARY_PREFIX "lib32")
+endif()
+
+add_custom_command(
+        TARGET Creamlinux POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+                ${CMAKE_SOURCE_DIR}/package/
+                ${CMAKE_CURRENT_BINARY_DIR}/lib/)
+
 
 # If you want to build the testapp, you'll need to find libsteam_api and copy it to lib/libsteam_api.so
-ADD_EXECUTABLE(Testapp ${CMAKE_SOURCE_DIR}/test.cpp)
-TARGET_LINK_LIBRARIES(Testapp libsteam_api.so)
-#TARGET_LINK_LIBRARIES(${CREAMLINUX_NAME} )
+#ADD_EXECUTABLE(Testapp ${CMAKE_SOURCE_DIR}/test.cpp)
+#TARGET_LINK_LIBRARIES(Testapp libsteam_api.so)

Dockerfile

@@ -0,0 +1,10 @@
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt update \
+    && apt upgrade -y \
+    && apt install -y --no-install-recommends \
+    build-essential gcc-multilib g++-multilib cmake git zip
+
+WORKDIR /usr/src/creamlinux

README.md

@@ -1,25 +1,104 @@
 # Creamlinux
-CreamApi(dlc unlocker) for Linux.
+A CreamAPI clone for Linux.
 
-## BIG NOTICE PLEASE READ
-This has primarily been made for my personal use, however I have decided to open source it. A lot of the code is based on hookey, which means this will work for HOI4 but other games are unknown. Maybe don't try it on VAC-secure games. THIS WILL NOT WORK THROUGH WINE/PROTON (maybe)
+Since 20PercentRendered has archived the repo, I have decided to fork and support it as far as I can.
 
-## Usage
-1. build the project with `sh build.sh`.
+## Support
+This *should* work for any native Linux Steam title that doesn't block LD_PRELOAD. It does not work with Proton or Wine - use SmokeAPI or other alternatives made specifically for Windows instead.
 
-2. Copy build/lib folder contents to the game folder.
-3. Then set steam launch params: `./cream.sh %command%`
-4. If you copied an existing cream_api.ini, make sure the line endings are set to linux line endings, otherwise this will not work (just open it and save it again)
+The following games have been tested and confirmed to work:
 
-When the dialog pops up, it will look a bit strange due to steam's bundled deps being ancient (gtk2 is seriously out of date). If you are running on Arch, you can run steam-native.
+ - Stellaris
+ - Hearts Of Iron IV
+ - Europa Universalis IV
+ - Crusader Kings II
+ - Crusader Kings III
+ - PAYDAY 2
 
+## Installation
+The easiest way of installing is using **Novattz**'s Python script: https://github.com/Novattz/creamlinux-installer
+It automatically downloads and sets up creamlinux for Steam games that you choose, as well as fetching all DLC IDs for it. Keep in mind that you will still need the actual, **up-to-date** DLC files in the game. The install script and creamlinux do **not** automatically download any game content. You will have to run it again if new DLCs are released for a game.
 
-If you want to load cream_api.ini from a separate path, specify the path with CREAM_CONFIG_PATH;
+If the script does not work for you, you can install `creamlinux` manually. Beware that you will have to manually update `cream_api.ini` to contain the DLC IDs for the games that you choose.
+
+## Manual Installation
+0. You will need the actual, **up-to-date** DLC files in the game. Creamlinux does **not** auto-download anything
+1. Download the [latest](https://github.com/anticitizn/creamlinux/releases/latest/download/creamlinux.zip) release of Creamlinux
+2. Unzip it and copy the files to the game's directory
+3. Set the game's steam launch params to `sh ./cream.sh %command%`
+4. Launch the game and have fun!
+
+The list of "supported" DLCs is stored in `cream_api.ini`. If you want to test creamlinux on a new game or a new DLC has just come out, you can add more entries here manually.
+
+If that doesn't work, please check the Troubleshooting section below.
+
+## Building from source
+0. Ensure you have all build dependencies installed:
+- On Ubuntu: `build-essential` `gcc-multilib` `g++-multilib` `cmake` `git`
+- On Arch: `base-devel` `multilib-devel` `cmake` `git`
+
+1. Clone the project:
+```
+git clone https://github.com/anticitizn/creamlinux
+```
+2. Build the project:
+```
+sh ./build.sh
+```
+
+3. Copy `output` folder contents to the game folder
+4. Set the game's steam launch params to `sh ./cream.sh %command%`
+
+Alternatively, if you have Docker installed, you can just run `docker compose up`
+
+# Troubleshooting
+## Red triangles next to DLCs
+This is normal. The DLCs should still work.
+
+![Red triangles next to DLCs are normal](https://cdn.discordapp.com/attachments/663174968791662594/1093109044295766106/image.png)
+
+## DLCs don't work
+Have you made sure to download the latest version of the DLC files? Sometimes unrelated patches or updates to the game will modify some DLC files, and creamlinux is currently somewhat sensitive to outdated files.
+
+## Game not starting after enabling creamlinux
+Are you sure that the creamlinux files are at the game's root directory and not in a subfolder?
+
+Try setting the executable flag of the `cream.sh` script (it should be set already, but just in case):
+```
+chmod +x cream.sh
+```
+
+## It doesn't work with Proton or Wine
+Creamlinux is specifically made for native Linux games. If you are using a compatibility layer, use alternatives made specifically for Windows (e.g. SmokeAPI, regular CreamAPI or whatever).
+
+## Nothing helped!
+Please collect a log using the instructions below as well as an overview of the game's directory using `ls -lh; ls -lh */`, then post an issue describing your situation [here](https://github.com/anticitizn/creamlinux/issues/new).
+
+## Gathering logs
+If using a KDE environment, set your game launch options to this:
+```
+konsole --hold -e sh ./cream.sh %command%
+```
+Or if you are using Gnome environment, you can set your launch options to this:
+```
+gnome-terminal -- sh -c "./cream.sh %command%; exec bash"
+```
+If using neither, install `konsole` and follow the KDE step.
+Then launch the game (skip any launchers like the Paradox launcher if possible, they interfere with the logging). Wait for the game to load if applicable, close it, then copy and paste the contents of the terminal.
+
+# Advanced 
+If you want to load `cream_api.ini` from a specific path, specify the path with `CREAM_CONFIG_PATH` in the launch options.
 
 ## Credits
+The many contributors who submitted bugfixes, tested games and updated the list of DLC IDs :)
+
+[Novattz](https://github.com/Novattz) for [creamlinux-installer](https://github.com/Novattz/creamlinux-installer)
+
+[Rosentti](https://github.com/Rosentti) for originally creating and maintaining this project
+
 [pulzed](https://github.com/pulzed) for [mINI](https://github.com/pulzed/mINI)(ini.h)
 
-Valve for steamworks
+[Valve](https://www.valvesoftware.com/) for [steamworks](https://partner.steamgames.com/)
 
 [gabime](https://github.com/gabime) for [spdlog](https://github.com/gabime/spdlog)
 

build.sh

@@ -1,6 +1,17 @@
-#!/bin/bash
+#!/bin/sh
 mkdir build
-cd build
-cmake ..
-make
-cp ../package/* ./lib/
+mkdir build/32
+mkdir build/64
+mkdir output
+
+cd build/32
+cmake ../.. -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_C_FLAGS=-m32
+make -j12
+cp lib/* ../../output/
+
+cd ../..
+
+cd build/64
+cmake ../.. -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_C_FLAGS=-m64
+make -j12
+cp lib/lib64Creamlinux.so ../../output/

docker-compose.yml

@@ -0,0 +1,7 @@
+services:
+  creamlinux-build:
+    build: .
+    container_name: creamlinux_build
+    volumes:
+      - .:/usr/src/creamlinux/
+    command: bash -c "sh ./build.sh && cd output && zip -r creamlinux.zip *"

steam/isteamapps.h → ext/steam/isteamapps.h

@@ -113,8 +113,8 @@ class ISteamApps
 #define STEAMAPPS_INTERFACE_VERSION "STEAMAPPS_INTERFACE_VERSION008"
 
 // Global interface accessor
-inline ISteamApps *SteamApps();
-STEAM_DEFINE_USER_INTERFACE_ACCESSOR( ISteamApps *, SteamApps, STEAMAPPS_INTERFACE_VERSION );
+//CREAM_COMMENTED inline ISteamApps *SteamApps();
+//CREAM_COMMENTED STEAM_DEFINE_USER_INTERFACE_ACCESSOR( ISteamApps *, SteamApps, STEAMAPPS_INTERFACE_VERSION );
 
 // callbacks
 #if defined( VALVE_CALLBACK_PACK_SMALL )

steam/isteamclient.h → ext/steam/isteamclient.h

@@ -95,7 +95,7 @@ class ISteamClient
 	virtual ISteamGameSearch *GetISteamGameSearch( HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char *pchVersion ) = 0;
 
 	// Deprecated. Applications should use SteamAPI_RunCallbacks() or SteamGameServer_RunCallbacks() instead.
-	STEAM_PRIVATE_API( virtual void RunFrame() = 0; )
+	virtual void RunFrame() = 0;
 
 	// returns the number of IPC calls made since the last time this function was called
 	// Used for perf debugging so you can understand how many IPC calls your game makes per frame
@@ -116,7 +116,7 @@ class ISteamClient
 	virtual ISteamHTTP *GetISteamHTTP( HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char *pchVersion ) = 0;
 
 	// Deprecated - the ISteamUnifiedMessages interface is no longer intended for public consumption.
-	STEAM_PRIVATE_API( virtual void *DEPRECATED_GetISteamUnifiedMessages( HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char *pchVersion ) = 0 ; )
+	virtual void *DEPRECATED_GetISteamUnifiedMessages( HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char *pchVersion ) = 0 ;
 
 	// Exposes the ISteamController interface - deprecated in favor of Steam Input
 	virtual ISteamController *GetISteamController( HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion ) = 0;
@@ -137,9 +137,9 @@ class ISteamClient
 	virtual ISteamHTMLSurface *GetISteamHTMLSurface(HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char *pchVersion) = 0;
 
 	// Helper functions for internal Steam usage
-	STEAM_PRIVATE_API( virtual void DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void (*)() ) = 0; )
-	STEAM_PRIVATE_API( virtual void DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void (*)() ) = 0; )
-	STEAM_PRIVATE_API( virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( SteamAPI_CheckCallbackRegistered_t func ) = 0; )
+	virtual void DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void (*)() ) = 0;
+	virtual void DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void (*)() ) = 0;
+	virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( SteamAPI_CheckCallbackRegistered_t func ) = 0;
 
 	// inventory
 	virtual ISteamInventory *GetISteamInventory( HSteamUser hSteamuser, HSteamPipe hSteamPipe, const char *pchVersion ) = 0;
@@ -159,20 +159,20 @@ class ISteamClient
 	// Steam Remote Play interface
 	virtual ISteamRemotePlay *GetISteamRemotePlay( HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion ) = 0;
 
-	STEAM_PRIVATE_API( virtual void DestroyAllInterfaces() = 0; )
+	virtual void DestroyAllInterfaces() = 0;
 
 };
 #define STEAMCLIENT_INTERFACE_VERSION		"SteamClient020"
 
 #ifndef STEAM_API_EXPORTS
 
 // Global ISteamClient interface accessor
-inline ISteamClient *SteamClient();
-STEAM_DEFINE_INTERFACE_ACCESSOR( ISteamClient *, SteamClient, SteamInternal_CreateInterface( STEAMCLIENT_INTERFACE_VERSION ), "global", STEAMCLIENT_INTERFACE_VERSION );
+//inline ISteamClient *SteamClient();
+//STEAM_DEFINE_INTERFACE_ACCESSOR( ISteamClient *, SteamClient, SteamInternal_CreateInterface( STEAMCLIENT_INTERFACE_VERSION ), "global", STEAMCLIENT_INTERFACE_VERSION );
 
 // The internal ISteamClient used for the gameserver interface.
 // (This is actually the same thing.  You really shouldn't need to access any of this stuff directly.)
-inline ISteamClient *SteamGameServerClient() { return SteamClient(); }
+//inline ISteamClient *SteamGameServerClient() { return SteamClient(); }
 
 #endif