Compare commits
26
Commits
exp_TU19-PS3
...
v1.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6e2886476 | ||
|
|
69541f1abf | ||
|
|
09cedad533 | ||
|
|
59b9fec5c2 | ||
|
|
6625df6c3e | ||
|
|
e0ed220c69 | ||
|
|
cba1f9ea3b | ||
|
|
79bfa4eb56 | ||
|
|
12f7125335 | ||
|
|
c677cc0065 | ||
|
|
eb3ae69d3f | ||
|
|
1580fdced7 | ||
|
|
7200598afa | ||
|
|
b08d478d73 | ||
|
|
b1189eb6c9 | ||
|
|
4e2369f194 | ||
|
|
e1508731d0 | ||
|
|
d236b70546 | ||
|
|
636bf0b692 | ||
|
|
22bcbde6a3 | ||
|
|
8b20122798 | ||
|
|
0672a56786 | ||
|
|
8e77eb70de | ||
|
|
d0cc8ce080 | ||
|
|
a0e81976e6 | ||
|
|
dd19188d93 |
@@ -0,0 +1,106 @@
|
||||
name: Build & Release
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'Version tag for release (e.g. v1.0.0).'
|
||||
required: true
|
||||
default: ''
|
||||
notes:
|
||||
description: 'URL to notes for release.'
|
||||
required: false
|
||||
default: ''
|
||||
|
||||
jobs:
|
||||
validate:
|
||||
runs-on: windows-2022
|
||||
steps:
|
||||
- name: Validate version format
|
||||
run: |
|
||||
if (-not ("${{ inputs.version }}" -match '^v\d+\.\d+\.\d+[a-zA-Z0-9.-]*$')) {
|
||||
Write-Error "Version '${{ inputs.version }}' doesn't match expected format (e.g. v1.0.0)"
|
||||
exit 1
|
||||
}
|
||||
|
||||
build:
|
||||
runs-on: windows-2022
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
configuration: [Release]
|
||||
platform: [PS3, Windows64] #[PS3, PSVita, Xbox 360, ORBIS, Windows64]
|
||||
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: https://github.com/actions/checkout@v4
|
||||
|
||||
- name: Build Cafeberry
|
||||
run: |
|
||||
& "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
|
||||
/p:Configuration=${{ matrix.configuration }} `
|
||||
/p:Platform=${{ matrix.platform }} `
|
||||
/m
|
||||
|
||||
- name: Zip Build (Consoles)
|
||||
if: matrix.platform != 'Windows64'
|
||||
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
|
||||
|
||||
- name: Zip Build (Windows64)
|
||||
if: matrix.platform == 'Windows64'
|
||||
run: 7z a -r LCE${{ matrix.platform }}.zip ./x64/${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
|
||||
|
||||
- name: Stage artifacts
|
||||
run: |
|
||||
New-Item -ItemType Directory -Force -Path staging
|
||||
Copy-Item LCE${{ matrix.platform }}.zip staging/
|
||||
|
||||
- name: Stage exe
|
||||
if: matrix.platform == 'Windows64'
|
||||
run: |
|
||||
Copy-Item ./x64/${{ matrix.configuration }}/Minecraft.Client.exe staging/
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: https://github.com/actions/upload-artifact@v3
|
||||
with:
|
||||
name: build-${{ matrix.platform }}
|
||||
path: staging/*
|
||||
|
||||
release:
|
||||
needs: build
|
||||
runs-on: windows-2022
|
||||
steps:
|
||||
- name: Download all build artifacts
|
||||
uses: https://github.com/actions/download-artifact@v3
|
||||
with:
|
||||
path: downloaded
|
||||
|
||||
- name: Fetch release notes
|
||||
id: notes
|
||||
run: |
|
||||
$notesSource = "${{ inputs.notes }}"
|
||||
$fallback = "## Cafeberry`n`n### Whoever made this release forgot to put notes, sorry!"
|
||||
|
||||
if ($notesSource -match '^https?://') {
|
||||
try {
|
||||
$body = (Invoke-WebRequest -Uri $notesSource -UseBasicParsing).Content
|
||||
if ([string]::IsNullOrWhiteSpace($body)) { $body = $fallback }
|
||||
} catch {
|
||||
$body = $fallback
|
||||
}
|
||||
}
|
||||
|
||||
"description<<EOF`n$body`nEOF" | Out-File -Append -Encoding utf8 -NoNewline:$false $env:GITHUB_OUTPUT
|
||||
|
||||
- name: Publish Release
|
||||
uses: akkuman/gitea-release-action@v1
|
||||
with:
|
||||
name: ${{ inputs.version }}
|
||||
server_url: ${{ gitea.server_url }}
|
||||
repository: ${{ gitea.repository }}
|
||||
token: ${{ gitea.token }}
|
||||
tag_name: ${{ inputs.version }}
|
||||
prerelease: false
|
||||
verbose: true
|
||||
files: downloaded/**/*
|
||||
body: ${{ steps.notes.outputs.description }}
|
||||
@@ -9,7 +9,9 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] =
|
||||
L"Friends", L"MyScore", L"TopRank"
|
||||
};
|
||||
|
||||
#if !defined(_DURANGO) && !defined(_WINDOWS64) && !defined(_XBOX) && !defined(__ORBIS__) // str1k3r - some platforms complain about this, also this wasnt in the leak?
|
||||
LeaderboardManager *LeaderboardManager::m_instance = NULL;
|
||||
#endif
|
||||
|
||||
void LeaderboardManager::DeleteInstance()
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// 4J - added
|
||||
void CreeperModel::_init(float g)
|
||||
{
|
||||
int yo = 4;
|
||||
int yo = 6;
|
||||
|
||||
head = new ModelPart(this, 0, 0);
|
||||
head->addBox(-4, - 8, -4, 8, 8, 8, g); // Head
|
||||
|
||||
@@ -46,9 +46,35 @@ void HorseRenderer::renderModel(shared_ptr<LivingEntity> mob, float wp, float ws
|
||||
}
|
||||
else
|
||||
{
|
||||
EntityRenderer::bindTexture(mob);
|
||||
model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
|
||||
// Ensure that any extra layers of texturing are disabled after rendering this horse
|
||||
shared_ptr<EntityHorse> horse = dynamic_pointer_cast<EntityHorse>(mob);
|
||||
ResourceLocation *location = getTextureLocation(mob);
|
||||
|
||||
// Pass 1: Bind only the coat texture (first valid layer) and render opaque
|
||||
int coatTex = location->getTexture(0);
|
||||
if( coatTex != -1 )
|
||||
{
|
||||
RenderManager.TextureBind(entityRenderDispatcher->textures->loadTexture(coatTex));
|
||||
}
|
||||
model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
|
||||
|
||||
// Pass 2: If horse has armor, find the armor texture in the layers and render with blending
|
||||
int armorType = horse->getArmorType();
|
||||
if( armorType > 0 )
|
||||
{
|
||||
glEnable(GL_BLEND);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
for( int i = 1; i < location->getTextureCount(); i++ )
|
||||
{
|
||||
int texId = location->getTexture(i);
|
||||
if( texId != -1 )
|
||||
{
|
||||
RenderManager.TextureBind(entityRenderDispatcher->textures->loadTexture(texId));
|
||||
model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
|
||||
}
|
||||
}
|
||||
glDisable(GL_BLEND);
|
||||
}
|
||||
|
||||
RenderManager.TextureBind(-1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -491,7 +491,7 @@ void LivingEntityRenderer::renderNameTag(shared_ptr<LivingEntity> mob, const wst
|
||||
float s = 1 / 60.0f * size;
|
||||
|
||||
glPushMatrix();
|
||||
glTranslatef((float) x, (float) y + 2.3f, (float) z);
|
||||
glTranslatef((float) x, (float) y + mob->bbHeight + 0.5f, (float) z);
|
||||
glNormal3f(0, 1, 0);
|
||||
|
||||
glRotatef(-this->entityRenderDispatcher->playerRotY, 0, 1, 0);
|
||||
|
||||
@@ -1435,7 +1435,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<CallAttributedProfiling>Disabled</CallAttributedProfiling>
|
||||
<AdditionalIncludeDirectories>Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
@@ -1472,46 +1472,6 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
|
||||
<Message>Run Windows64 postbuild script</Message>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<CallAttributedProfiling>Disabled</CallAttributedProfiling>
|
||||
<AdditionalIncludeDirectories>Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||
<ShowIncludes>false</ShowIncludes>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
|
||||
<AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_Debug\Minecraft.World.lib;%(AdditionalDependencies);XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib</AdditionalDependencies>
|
||||
<ShowProgress>NotSet</ShowProgress>
|
||||
<SuppressStartupBanner>false</SuppressStartupBanner>
|
||||
</Link>
|
||||
<ImageXex>
|
||||
<ConfigurationFile>$(ProjectDir)xbox\xex-dev.xml</ConfigurationFile>
|
||||
</ImageXex>
|
||||
<ImageXex>
|
||||
<TitleID>1480659447</TitleID>
|
||||
</ImageXex>
|
||||
<ImageXex>
|
||||
<AdditionalSections>584111F7=$(ProjectDir)xbox\GameConfig\Minecraft.spa,RO;media=$(ProjectDir)xbox\XZP\Minecraft.xzp,RO</AdditionalSections>
|
||||
<Pal50Incompatible>true</Pal50Incompatible>
|
||||
</ImageXex>
|
||||
<Deploy>
|
||||
<DeploymentType>CopyToHardDrive</DeploymentType>
|
||||
<DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\res=Xbox\res;$(RemoteRoot)=Xbox\AvatarAwards;$(RemoteRoot)\Tutorial=Xbox\Tutorial\Tutorial;$(RemoteRoot)=Xbox\584111F70AAAAAAA;$(RemoteRoot)=Xbox\kinect\speech;$(RemoteRoot)=Xbox\XZP\TMSFiles.xzp</DeploymentFiles>
|
||||
</Deploy>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
@@ -34048,7 +34008,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">false</ExcludedFromBuild>
|
||||
|
||||
@@ -1858,7 +1858,7 @@ void Minecraft::run_middle()
|
||||
achievementPopup->render();
|
||||
|
||||
PIXBeginNamedEvent(0,"Sleeping");
|
||||
Sleep(0); // 4J - was Thread.yield()
|
||||
//Sleep(0); // 4J - was Thread.yield()
|
||||
PIXEndNamedEvent();
|
||||
|
||||
// if (Keyboard::isKeyDown(Keyboard::KEY_F7)) Display.update(); // 4J - removed condition
|
||||
|
||||
@@ -116,7 +116,11 @@ void Options::init()
|
||||
bobView = true;
|
||||
anaglyph3d = false;
|
||||
advancedOpengl = false;
|
||||
framerateLimit = 2;
|
||||
#ifdef _WINDOWS64
|
||||
framerateLimit = 0;
|
||||
#else
|
||||
framerateLimit = 2;
|
||||
#endif
|
||||
fancyGraphics = true;
|
||||
ambientOcclusion = true;
|
||||
renderClouds = true;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,109 +1,32 @@
|
||||
#pragma once
|
||||
|
||||
#include "Common\Leaderboards\SonyLeaderboardManager.h"
|
||||
#include "Common\Leaderboards\LeaderboardManager.h"
|
||||
|
||||
class OrbisLeaderboardManager : public LeaderboardManager
|
||||
{
|
||||
protected:
|
||||
enum EStatsState
|
||||
{
|
||||
eStatsState_Idle,
|
||||
eStatsState_Getting,
|
||||
eStatsState_Failed,
|
||||
eStatsState_Ready,
|
||||
eStatsState_Canceled,
|
||||
//eStatsState_Writing,
|
||||
eStatsState_Max
|
||||
};
|
||||
#include <np.h>
|
||||
|
||||
class OrbisLeaderboardManager : public SonyLeaderboardManager
|
||||
{
|
||||
public:
|
||||
OrbisLeaderboardManager();
|
||||
virtual ~OrbisLeaderboardManager();
|
||||
|
||||
private:
|
||||
unsigned short m_openSessions;
|
||||
protected:
|
||||
|
||||
C4JThread *m_threadScoreboard;
|
||||
bool m_running;
|
||||
virtual HRESULT initialiseScoreUtility();
|
||||
|
||||
int m_titleContext;
|
||||
int32_t m_requestId;
|
||||
virtual bool scoreUtilityAlreadyInitialised(HRESULT hr);
|
||||
|
||||
//SceNpId m_myNpId;
|
||||
virtual HRESULT createTitleContext(const SceNpId &npId);
|
||||
|
||||
static int scoreboardThreadEntry(LPVOID lpParam);
|
||||
void scoreboardThreadInternal();
|
||||
virtual HRESULT destroyTitleContext(int titleContext);
|
||||
|
||||
bool getScoreByIds();
|
||||
bool getScoreByRange();
|
||||
virtual HRESULT createTransactionContext(int titleContext);
|
||||
|
||||
bool setScore();
|
||||
queue<RegisterScore> m_views;
|
||||
virtual HRESULT abortTransactionContext(int transactionContext);
|
||||
|
||||
CRITICAL_SECTION m_csViewsLock;
|
||||
virtual HRESULT destroyTransactionContext(int transactionContext);
|
||||
|
||||
EStatsState m_eStatsState; //State of the stats read
|
||||
// EFilterMode m_eFilterMode;
|
||||
virtual HRESULT getFriendsList(sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::FriendsList> &friendsList);
|
||||
|
||||
ReadScore *m_scores;
|
||||
unsigned int m_maxRank;
|
||||
//SceNpScoreRankData *m_stats;
|
||||
|
||||
public:
|
||||
virtual void Tick();// {}
|
||||
|
||||
//Open a session
|
||||
virtual bool OpenSession();// { return true; }
|
||||
|
||||
//Close a session
|
||||
virtual void CloseSession();// {}
|
||||
|
||||
//Delete a session
|
||||
virtual void DeleteSession();// {}
|
||||
|
||||
//Write the given stats
|
||||
//This is called synchronously and will not free any memory allocated for views when it is done
|
||||
|
||||
virtual bool WriteStats(unsigned int viewCount, ViewIn views);// { return false; }
|
||||
|
||||
virtual bool ReadStats_Friends(LeaderboardReadListener *callback, int difficulty, EStatsType type, PlayerUID myUID, unsigned int startIndex, unsigned int readCount);// { return false; }
|
||||
virtual bool ReadStats_MyScore(LeaderboardReadListener *callback, int difficulty, EStatsType type, PlayerUID myUID, unsigned int readCount);// { return false; }
|
||||
virtual bool ReadStats_TopRank(LeaderboardReadListener *callback, int difficulty, EStatsType type, unsigned int startIndex, unsigned int readCount);// { return false; }
|
||||
|
||||
//Perform a flush of the stats
|
||||
virtual void FlushStats();// {}
|
||||
|
||||
//Cancel the current operation
|
||||
virtual void CancelOperation();// {}
|
||||
|
||||
//Is the leaderboard manager idle.
|
||||
virtual bool isIdle();// { return true; }
|
||||
|
||||
|
||||
private:
|
||||
int getBoardId(int difficulty, EStatsType);
|
||||
|
||||
//LeaderboardManager::ReadScore *filterJustScorers(unsigned int &num, LeaderboardManager::ReadScore *friendsData);
|
||||
|
||||
SceNpScorePlayerRankData *addPadding(unsigned int num, SceNpScoreRankData *rankData);
|
||||
|
||||
void convertToOutput(unsigned int &num, ReadScore *out, SceNpScorePlayerRankData *rankData, SceNpScoreComment *comm);
|
||||
|
||||
void toBinary(void *out, SceNpScoreComment *in);
|
||||
void fromBinary(SceNpScoreComment **out, void *in);
|
||||
|
||||
void toBase32(SceNpScoreComment *out, void *in);
|
||||
void fromBase32(void *out, SceNpScoreComment *in);
|
||||
|
||||
void toSymbols(char *);
|
||||
void fromSymbols(char *);
|
||||
|
||||
bool test_string(string);
|
||||
|
||||
void initReadScoreStruct(ReadScore &out, SceNpScoreRankData &);
|
||||
void fillReadScoreStruct(ReadScore &out, SceNpScoreComment &comment);
|
||||
|
||||
static bool SortByRank(const ReadScore &lhs, const ReadScore &rhs);
|
||||
|
||||
//void NotifyAsyncPlusFeature();
|
||||
virtual char * getComment(SceNpScoreComment *comment);
|
||||
};
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include "stdafx.h"
|
||||
#include "OldSdk.h"
|
||||
#ifdef __PSVITA__
|
||||
|
||||
|
||||
@@ -434,7 +434,11 @@ void Textures::bindTextureLayers(ResourceLocation *resource)
|
||||
|
||||
for( int i = 0; i < layers; i++ )
|
||||
{
|
||||
RenderManager.TextureBind(loadTexture(resource->getTexture(i)));
|
||||
int texId = resource->getTexture(i);
|
||||
if( texId != -1 )
|
||||
{
|
||||
RenderManager.TextureBind(loadTexture(texId));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -498,7 +498,7 @@ app.DebugPrintf("width: %d, height: %d\n", width, height);
|
||||
|
||||
DXGI_SWAP_CHAIN_DESC sd;
|
||||
ZeroMemory( &sd, sizeof( sd ) );
|
||||
sd.BufferCount = 1;
|
||||
sd.BufferCount = 2;
|
||||
sd.BufferDesc.Width = width;
|
||||
sd.BufferDesc.Height = height;
|
||||
sd.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "AttackDamageMobEffect.h"
|
||||
|
||||
AttackDamageMobEffect::AttackDamageMobEffect(int id, bool isHarmful, eMinecraftColour color) : MobEffect(id, isHarmful, color)
|
||||
{
|
||||
}
|
||||
|
||||
double AttackDamageMobEffect::getAttributeModifierValue(int amplifier, AttributeModifier *original)
|
||||
{
|
||||
if (id == MobEffect::weakness->id)
|
||||
{
|
||||
return -0.5f * (amplifier + 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
return 1.3 * (amplifier + 1);
|
||||
}
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "AttackDamageMobEffect.h"
|
||||
|
||||
AttackDamageMobEffect::AttackDamageMobEffect(int id, bool isHarmful, eMinecraftColour color) : MobEffect(id, isHarmful, color)
|
||||
{
|
||||
}
|
||||
|
||||
double AttackDamageMobEffect::getAttributeModifierValue(int amplifier, AttributeModifier *original)
|
||||
{
|
||||
if (id == MobEffect::weakness->id)
|
||||
{
|
||||
return -0.5f * (amplifier + 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
return 1.3 * (amplifier + 1);
|
||||
}
|
||||
}
|
||||
@@ -77,7 +77,7 @@ void MinecartTNT::destroy(DamageSource *source)
|
||||
|
||||
void MinecartTNT::explode(double speedSqr)
|
||||
{
|
||||
if (!level->isClientSide)
|
||||
if (!level->isClientSide && app.GetGameHostOption(eGameHostOption_TNT))
|
||||
{
|
||||
double speed = sqrt(speedSqr);
|
||||
if (speed > 5) speed = 5;
|
||||
@@ -121,7 +121,7 @@ void MinecartTNT::primeFuse()
|
||||
{
|
||||
fuse = 80;
|
||||
|
||||
if (!level->isClientSide)
|
||||
if (!level->isClientSide && app.GetGameHostOption(eGameHostOption_TNT))
|
||||
{
|
||||
level->broadcastEntityEvent(shared_from_this(), EVENT_PRIME);
|
||||
level->playEntitySound(shared_from_this(), eSoundType_RANDOM_FUSE, 1, 1.0f);
|
||||
|
||||
@@ -1124,7 +1124,7 @@
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<CallAttributedProfiling>Disabled</CallAttributedProfiling>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
|
||||
@@ -79,7 +79,7 @@ bool NoteBlockTile::triggerEvent(Level *level, int x, int y, int z, int i, int n
|
||||
break;
|
||||
}
|
||||
app.DebugPrintf("NoteBlockTile::triggerEvent - playSound - pitch = %f\n",pitch);
|
||||
level->playSound(x + 0.5, y + 0.5, z + 0.5, iSound, 3, pitch);
|
||||
level->playSound(x + 0.5, y + 0.5, z + 0.5, iSound, 3, pitch, 64.0);
|
||||
level->addParticle(eParticleType_note, x + 0.5, y + 1.2, z + 0.5, note / 24.0, 0, 0);
|
||||
|
||||
return true;
|
||||
|
||||
@@ -218,10 +218,12 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
|
||||
if (extend && param1 == TRIGGER_CONTRACT)
|
||||
{
|
||||
level->setData(x, y, z, facing | EXTENDED_BIT, UPDATE_CLIENTS);
|
||||
ignoreUpdate(false);
|
||||
return false;
|
||||
}
|
||||
else if (!extend && param1 == TRIGGER_EXTEND)
|
||||
{
|
||||
ignoreUpdate(false);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -247,6 +249,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
|
||||
}
|
||||
else
|
||||
{
|
||||
ignoreUpdate(false);
|
||||
return false;
|
||||
}
|
||||
PIXEndNamedEvent();
|
||||
@@ -340,6 +343,12 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
|
||||
|
||||
ignoreUpdate(false);
|
||||
|
||||
level->updateNeighborsAt(x, y, z, id);
|
||||
int stepX = x + Facing::STEP_X[facing];
|
||||
int stepY = y + Facing::STEP_Y[facing];
|
||||
int stepZ = z + Facing::STEP_Z[facing];
|
||||
level->updateNeighborsAt(stepX, stepY, stepZ, id);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -189,7 +189,10 @@ void StemTile::spawnResources(Level *level, int x, int y, int z, int data, float
|
||||
if (fruit == Tile::melon) seed = Item::seeds_melon;
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
popResource(level, x, y, z, shared_ptr<ItemInstance>(new ItemInstance(seed)));
|
||||
if (level->random->nextInt(15) <= data)
|
||||
{
|
||||
popResource(level, x, y, z, shared_ptr<ItemInstance>(new ItemInstance(seed)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
# Acacia Log
|
||||
This project is a modified version of the December 17th 2014 Codebase, aimed at backporting the newer title updates back to the codebase, with cross-play across all platfoms (including PC).
|
||||
# Project Cafeberry
|
||||
Cafeberry is a project aiming to update the December 17th 2014 codebase (mostly) via decompilation, with a focus on consoles.
|
||||
|
||||
[](https://discord.gg/aPAF5WFaW)
|
||||
|
||||
# Status
|
||||
| Platform | Development Status | Known Issues |
|
||||
| :------- | :-------------------- | :------------------------------------------------------------------------ |
|
||||
| PS3 | Active | All TU19 blocks display as stone blocks when placed (missing SPU code). |
|
||||
| Xbox 360 | Likely cancelled | Missing XUI files for GUIs added in TU25+. See notes. |
|
||||
| PS4 | Active | Only Buildable on Windows 7 With 1.70 SDK. See Notes |
|
||||
| Xbox One | On hold | Needs to be re-coded to run on Developer Mode UWP instead. |
|
||||
| PS Vita | On hold | Fails during compilation due to missing network library dependencies. |
|
||||
| Platform | Development Status | Known Issues |
|
||||
| :------------- | :-------------------- | :------------------------------------------------------------------------ |
|
||||
| PS3 | Active | SPU variants for TU19 blocks are missing, needs to be further optimized. |
|
||||
| Xbox 360 | On hold | Havent tested, should work? |
|
||||
| PS4 | Active | Only Buildable on Windows 7 With 1.70 SDK. See Notes |
|
||||
| Xbox One | On hold | Needs to be re-coded to run on Developer Mode UWP instead. |
|
||||
| PS Vita | On hold | Fails during compilation due to missing network library dependencies. |
|
||||
| Wii U & Switch | Work in progress | UI System (ImXui) is still in progress, need to decompile the rest. |
|
||||
|
||||
**Notes:**
|
||||
- **Xbox 360:** TU25 and newer TUs include new GUIs, but we lack the XUI files for them, solutions:
|
||||
1. Recreate the GUIs from scratch using the XUI designer (insanely difficult to get accurate to actual LCE)
|
||||
|
||||
- **PS4:** Can't be built on Windows 10+ because the 1.70 SDK only supports Windows 7, solutions:
|
||||
1. Attempt to add support for 4.50 SDK (difficult or unlikely to work)
|
||||
2. Getting the 1.70 SDK on Windows 10+ (annoying to do)
|
||||
Reference in New Issue
Block a user