Skip to content

Commit

Permalink
patch
Browse files Browse the repository at this point in the history
Snirozu committed Sep 29, 2024
1 parent d4a8166 commit f969727
Showing 7 changed files with 28 additions and 97 deletions.
4 changes: 3 additions & 1 deletion Project.xml
Original file line number Diff line number Diff line change
@@ -98,7 +98,8 @@
<assets path="assets/shared" library="shared" exclude="*.ogg" if="web" />
<assets path="assets/shared" library="shared" exclude="*.mp3" unless="web" />
<assets path="assets/week_assets" library="week_assets" rename="assets" exclude="*.ogg" if="web" />
<assets path="assets/week_assets" library="week_assets" rename="assets" exclude="*.mp3" unless="web" />
<assets path="assets/week_assets" library="week_assets" rename="assets" exclude="*.mp3"
unless="web" />

<section if="MODS_ALLOWED">
<assets path='example_mods' rename='mods' embed='false' />
@@ -127,6 +128,7 @@
<haxelib name="flxanimate" />
<haxelib name="lumod" />
<haxelib name="actuate" />
<haxelib name="compiletime" />

<haxedef name="openflPos" />
<haxedef name="hscriptPos" />
5 changes: 5 additions & 0 deletions hmm.json
Original file line number Diff line number Diff line change
@@ -119,6 +119,11 @@
"name": "actuate",
"type": "haxelib",
"version": "1.9.0"
},
{
"name": "compiletime",
"type": "haxelib",
"version": "2.8.0"
}
]
}
16 changes: 10 additions & 6 deletions source/online/Deflection.hx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package online;

import online.macro.CompiledClassList;
import CompileTime;

class Deflection {
@:unreflective public static var classBlacklist:Array<Class<Dynamic>> = null;
@@ -23,6 +23,8 @@ class Deflection {
if (classBlacklist != null)
return;

classBlacklist = [];

// Add blacklisting for prohibited classes and packages.

// `Sys`
@@ -71,38 +73,40 @@ class Deflection {

// `polymod.*`
// Contains functions which may allow for un-blacklisting other modules.
for (cls in CompiledClassList.listClassesInPackage('polymod')) {
for (cls in CompileTime.getAllClasses('polymod')) {
if (cls == null)
continue;
classBlacklist.push(cls);
}

// `sys.*`
// Access to system utilities such as the file system.
for (cls in CompiledClassList.listClassesInPackage('sys')) {
for (cls in CompileTime.getAllClasses('sys')) {
if (cls == null)
continue;
classBlacklist.push(cls);
}

for (cls in CompiledClassList.listClassesInPackage('tea')) {
for (cls in CompileTime.getAllClasses('tea')) {
if (cls == null)
continue;
classBlacklist.push(cls);
}

for (cls in CompiledClassList.listClassesInPackage('teaBase')) {
for (cls in CompileTime.getAllClasses('teaBase')) {
if (cls == null)
continue;
classBlacklist.push(cls);
}

for (cls in CompiledClassList.listClassesInPackage('lumod')) {
for (cls in CompileTime.getAllClasses('lumod')) {
if (cls == null)
continue;
classBlacklist.push(cls);
}

classBlacklist.push(CompileTime);

#if (extension_androidtools)
// `android.jni.JNICache`
// Same as `lime.system.JNI`
88 changes: 0 additions & 88 deletions source/online/macro/CompiledClassList.hx

This file was deleted.

3 changes: 2 additions & 1 deletion source/online/net/Auth.hx
Original file line number Diff line number Diff line change
@@ -53,7 +53,8 @@ class Auth {
}

public static function saveClose() {
File.saveContent(savePath, Json.stringify(saveData));
if (saveData.id != null && saveData.token != null)
File.saveContent(savePath, Json.stringify(saveData));
Sys.exit(1);
}
}
8 changes: 8 additions & 0 deletions source/online/states/OptionsState.hx
Original file line number Diff line number Diff line change
@@ -64,6 +64,14 @@ class OptionsState extends MusicBeatState {
curOption.inputs[0].text += ":2567";
}

if (curOption.inputs[0].text == "ws://funkin.sniro.boo") {
curOption.inputs[0].text = "wss://funkin.sniro.boo";
}

if (curOption.inputs[0].text == "ws://gettinfreaky.onrender.com") {
curOption.inputs[0].text = "wss://gettinfreaky.onrender.com";
}

GameClient.serverAddress = curOption.inputs[0].text;
try {
online.net.FunkinNetwork.ping();
1 change: 0 additions & 1 deletion source/states/CreditsState.hx
Original file line number Diff line number Diff line change
@@ -64,7 +64,6 @@ class CreditsState extends MusicBeatState
['Keoiki', 'keoiki', 'Note Splash Animations and Latin Alphabet', 'https://twitter.com/Keoiki_', 'D2D2D2'],
['superpowers04', 'superpowers04', 'LUA JIT Fork', 'https://twitter.com/superpowers04', 'B957ED'],
['Smokey', 'smokey', 'Sprite Atlas Support', 'https://twitter.com/Smokey_5_', '483D92'],
['shubs', '', 'Ex-Programmer of Psych Engine', '', '5E99DF'],
['bb-panzu', 'bb', 'Ex-Programmer of Psych Engine', 'https://twitter.com/bbsub3', '3E813A'],
[''],
["Funkin' Crew"],

0 comments on commit f969727

Please sign in to comment.