Add compatibility layer for 0.6.3 mods in 1.0.4

.github/ISSUE_TEMPLATE/bugs.yml

@@ -1,10 +1,11 @@
 name: Bug report
 description: Report bugs with the engine here
-labels: [bug]
+labels: ["Type: Bug","Awaits labels"]
 body:
   - type: textarea
     id: description
     attributes:
+
       label: "Describe your bug here."
     validations:
       required: true
@@ -60,6 +61,7 @@ body:
         - "HTML5"
     validations:
       required: true
+
 
   - type: input
     id: buildsummary

.github/ISSUE_TEMPLATE/crash.yml

@@ -1,6 +1,6 @@
 name: Crash report
 description: Report bugs that cause the engine to crash here
-labels: [crash]
+labels: ["Type: Crash", "Awaits labels"]
 body:
   - type: textarea
     id: description

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,6 +1,6 @@
 name: Feature Request
 description: Request something to be added to P-Slice
-labels: [enhancement]
+labels: ["Type: request","Awaits labeling"]
 body:
   - type: textarea
     attributes:

.github/workflows/build.yml

@@ -79,8 +79,8 @@ jobs:
         if: inputs.exportPath == 'android'
         run: |
           haxelib run lime config ANDROID_SDK $ANDROID_HOME
-          haxelib run lime config ANDROID_NDK_ROOT $ANDROID_NDK_LATEST_HOME
-          haxelib run lime config JAVA_HOME $JAVA_HOME_17_arm64
+          haxelib run lime config ANDROID_NDK_ROOT $ANDROID_NDK_HOME
+          haxelib run lime config JAVA_HOME $JAVA_HOME_17_X64
           haxelib run lime config ANDROID_SETUP true
 
       - name: Compile

.github/workflows/main.yml

@@ -15,12 +15,12 @@ jobs:
       matrix:
         include:
           - name: Linux
-            os: ubuntu-latest
+            os: ubuntu-24.04
             setupScript: sh ./setup/unix.sh
             CACHE_NAME: P-Slice.1.0.desktop-cache
 
           - name: Mobile
-            os: macos-latest
+            os: macos-15
             setupScript: sh ./setup/mobile.sh
             CACHE_NAME: P-Slice.1.0.mobile-cache
     uses: ./.github/workflows/dependencies.yml
@@ -82,7 +82,7 @@ jobs:
       matrix:
         include:
           - name: Android
-            os: macos-15
+            os: ubuntu-24.04
             exportPath: android
             buildArgs: "android"
             cacheLibrariesPath: P-Slice.1.0.mobile-cache

Project.xml

@@ -7,18 +7,18 @@
 
 	<app unless="PROFILE_BUILD || mobile" title="Friday Night Funkin': P-Slice Engine"
 		file="PSliceEngine" packageName="com.mikolka9144.pslice" package="com.mikolka9144.pslice"
-		main="Main" version="3.2" company="mikolka9144" />
+		main="Main" version="3.4.1" company="mikolka9144" />
 	<app if="PROFILE_BUILD" title="P-Slice Engine Profiling build" file="PSliceEngine"
 		packageName="com.mikolka9144.testPslice" package="com.mikolka9144.testPslice" main="Main"
-		version="3.2" company="mikolka9144" />
+		version="3.4.1" company="mikolka9144" />
 	<app if="mobile" unless="PROFILE_BUILD" title="P-Slice Engine" file="PSliceEngine"
 		packageName="com.mikolka9144.pslice" package="com.mikolka9144.pslice" main="Main"
-		version="3.2" company="mikolka9144" />
+		version="3.4.1" company="mikolka9144" />
 	<!--Switch
 	Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
 	<meta build-number="340" />
-	<config type="android" gradle-version="8.10.2" gradle-plugin="8.8.0" ndkVersion="28.0"
+	<config type="android" gradle-version="8.10.2" gradle-plugin="8.8.0" ndkVersion="27.3"
 		minimum-sdk-version="26" target-sdk-version="35" />
 	<!-- NOTE TO SELF: DISABLE THIS IF ISSUES ARE FOUND -->
 	<haxedef name="LINC_LUA_RELATIVE_DYNAMIC_LIB" /> <!-- stable luas PUT AFTER FIRST LINE WITH APP
@@ -314,10 +314,10 @@
 	for crash handler-->
 	<section if="cpp">
 		<!-- !DO NOT ENABLE THIS -->
+		<!-- <haxedef name="HXCPP_GC_MOVING" unless="HXCPP_TRACY_MEMORY"/> -->
 		<!-- This will break the GC and delete textures on it's own-->
-		<!-- <haxedef name="HXCPP_CHECK_POINTER" /> -->
+		<haxedef name="HXCPP_CHECK_POINTER" />
 
-		<!-- <haxedef name="HXCPP_GC_MOVING" unless="HXCPP_TRACY_MEMORY"/> -->
 		<haxedef name="HXCPP_STACK_LINE" />
 		<haxedef name="HXCPP_STACK_TRACE" />
 		<haxedef name="HXCPP_CATCH_SEGV" />

assets/base_game/week_data/week5/images/christmas/bottomBop.xml

@@ -1,33 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextureAtlas imagePath="bottomBop.png">
-	<!-- Created with Adobe Animate version 21.0.1.37179 -->
-	<!-- http://www.adobe.com/products/animate.html -->
-	<SubTexture name="Bottom Level Boppers Idle0000" x="4" y="4" width="1975" height="661" pivotX="3.2" pivotY="13.95" frameX="-3" frameY="-13" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0001" x="4" y="4" width="1975" height="661" frameX="-3" frameY="-13" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0002" x="1983" y="4" width="1972" height="664" frameX="-4" frameY="-10" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0003" x="1983" y="4" width="1972" height="664" frameX="-4" frameY="-10" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0004" x="4" y="672" width="1973" height="672" frameX="0" frameY="-2" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0005" x="4" y="672" width="1973" height="672" frameX="0" frameY="-2" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0006" x="1981" y="672" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0007" x="1981" y="672" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0008" x="1981" y="672" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0009" x="1981" y="672" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0010" x="1981" y="672" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0011" x="1981" y="672" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0012" x="1981" y="672" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers Idle0013" x="1981" y="672" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0000" x="4" y="1350" width="1882" height="705" pivotX="-12.75" pivotY="44.35" frameX="-7" frameY="0" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0001" x="4" y="1350" width="1882" height="705" frameX="-7" frameY="0" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0002" x="1890" y="1350" width="1893" height="698" frameX="-6" frameY="-7" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0003" x="1890" y="1350" width="1893" height="698" frameX="-6" frameY="-7" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0004" x="4" y="2059" width="1897" height="686" frameX="-3" frameY="-19" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0005" x="4" y="2059" width="1897" height="686" frameX="-3" frameY="-19" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0006" x="1905" y="2059" width="1902" height="685" frameX="0" frameY="-20" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0007" x="1905" y="2059" width="1902" height="685" frameX="0" frameY="-20" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0008" x="1905" y="2059" width="1902" height="685" frameX="0" frameY="-20" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0009" x="1905" y="2059" width="1902" height="685" frameX="0" frameY="-20" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0010" x="1905" y="2059" width="1902" height="685" frameX="0" frameY="-20" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0011" x="1905" y="2059" width="1902" height="685" frameX="0" frameY="-20" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0012" x="1905" y="2059" width="1902" height="685" frameX="0" frameY="-20" frameWidth="1902" frameHeight="705"/>
-	<SubTexture name="Bottom Level Boppers HEY!!0013" x="1905" y="2059" width="1902" height="685" frameX="0" frameY="-20" frameWidth="1902" frameHeight="705"/>
+	<SubTexture name="Bottom Level Boppers0000" x="0" y="0" width="1975" height="661" frameX="-3" frameY="-13" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0001" x="0" y="0" width="1975" height="661" frameX="-3" frameY="-13" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0002" x="1985" y="0" width="1972" height="664" frameX="-4" frameY="-10" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0003" x="1985" y="0" width="1972" height="664" frameX="-4" frameY="-10" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0004" x="0" y="674" width="1973" height="672" frameX="0" frameY="-2" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0005" x="0" y="674" width="1973" height="672" frameX="0" frameY="-2" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0006" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0007" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0008" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0009" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0010" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0011" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0012" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674" />
+	<SubTexture name="Bottom Level Boppers0013" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674" />
 </TextureAtlas>

gitVersion.txt

@@ -1 +1 @@
-3.4
+3.4.1

setup/mobile.sh

@@ -12,7 +12,7 @@ haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cd
 haxelib git hxcpp https://github.com/Psych-Slice/hxcpp.git e48576506a270237ec2ec6501c0bedbd03034af1 --quiet --skip-dependencies
 
 haxelib git openfl https://github.com/FunkinCrew/openfl.git c4fa1dcfc384f07bb537e08cae671f9507fe49e6 --quiet --skip-dependencies
-haxelib git lime https://github.com/Psych-Slice/lime-pslice.git 1c65d15d99a9b0771b2ecfaf261861e5946933c2 --quiet
+haxelib git lime https://github.com/Psych-Slice/lime-pslice.git 160f0e0da13b7b9600aca950ae7db30167fafc9b --quiet
 
 haxelib install flixel-addons 3.3.2 --quiet --skip-dependencies
 haxelib install flixel-tools 1.5.1 --quiet --skip-dependencies

setup/unix.sh

@@ -11,7 +11,7 @@ haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cd
 haxelib git hxcpp https://github.com/Psych-Slice/hxcpp.git e48576506a270237ec2ec6501c0bedbd03034af1 --quiet --skip-dependencies
 
 haxelib git openfl https://github.com/FunkinCrew/openfl.git c4fa1dcfc384f07bb537e08cae671f9507fe49e6 --quiet --skip-dependencies
-haxelib git lime https://github.com/Psych-Slice/lime-pslice.git 1c65d15d99a9b0771b2ecfaf261861e5946933c2 --quiet
+haxelib git lime https://github.com/Psych-Slice/lime-pslice.git 160f0e0da13b7b9600aca950ae7db30167fafc9b --quiet
 
 haxelib install flixel-addons 3.3.2 --quiet --skip-dependencies
 haxelib install flixel-tools 1.5.1 --quiet --skip-dependencies

setup/windows.bat

@@ -11,7 +11,7 @@ haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cd
 haxelib git hxcpp https://github.com/Psych-Slice/hxcpp.git e48576506a270237ec2ec6501c0bedbd03034af1 --quiet --skip-dependencies
 
 haxelib git openfl https://github.com/FunkinCrew/openfl.git c4fa1dcfc384f07bb537e08cae671f9507fe49e6 --quiet --skip-dependencies
-haxelib git lime https://github.com/Psych-Slice/lime-pslice.git 1c65d15d99a9b0771b2ecfaf261861e5946933c2 --quiet
+haxelib git lime https://github.com/Psych-Slice/lime-pslice.git 160f0e0da13b7b9600aca950ae7db30167fafc9b --quiet
 
 haxelib install flixel-addons 3.3.2 --quiet --skip-dependencies
 haxelib install flixel-tools 1.5.1 --quiet --skip-dependencies

source/mikolka/compatibility/freeplay/FreeplayHelpers.hx

@@ -109,6 +109,7 @@ class FreeplayHelpers
 		try
 		{
 			PlayState.SONG = Song.loadFromJson(poop, songLowercase);
+			if(PlayState.SONG == null) throw "Song parsing failed!";
 			PlayState.isStoryMode = false;
 			PlayState.storyDifficulty = diffId;
 

source/mikolka/compatibility/ui/StoryModeHooks.hx

@@ -85,6 +85,7 @@ class StoryModeHooks {
 
 
 				Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + diffic, PlayState.storyPlaylist[0].toLowerCase());
+                if(PlayState.SONG == null) throw "Song parsing failed!";
 				PlayState.campaignScore = 0;
 				PlayState.campaignMisses = 0;
                 return true;

source/mikolka/vslice/charSelect/CharSelectGF.hx

@@ -2,15 +2,11 @@ package mikolka.vslice.charSelect;
 
 import haxe.Exception;
 import mikolka.funkin.FlxAtlasSprite;
-import flixel.tweens.FlxTween;
-import flixel.tweens.FlxEase;
-import flixel.math.FlxMath;
 import mikolka.funkin.FramesJSFLParser;
 import mikolka.funkin.FramesJSFLParser.FramesJSFLInfo;
 import mikolka.funkin.FramesJSFLParser.FramesJSFLFrame;
 import flixel.math.FlxMath;
 import funkin.vis.dsp.SpectralAnalyzer;
-import mikolka.compatibility.funkin.FunkinPath as Paths;
 
 class CharSelectGF extends FlxAtlasSprite 
 {
@@ -23,7 +19,6 @@ class CharSelectGF extends FlxAtlasSprite
 
   var intendedYPos:Float = 0;
   var intendedAlpha:Float = 0;
-  var list:Array<String> = [];
 
   var analyzer:SpectralAnalyzer;
 
@@ -32,9 +27,7 @@ class CharSelectGF extends FlxAtlasSprite
 
   public function new()
   {
-    super(0, 0, "charSelect/gfChill");
-
-    list = anim.curSymbol.getFrameLabelNames();
+    super(0, 0, null);
 
     switchGF("bf");
   }

source/mikolka/vslice/charSelect/CharSelectPlayer.hx

@@ -6,7 +6,7 @@ class CharSelectPlayer extends FlxAtlasSprite
 {
   public function new(x:Float, y:Float)
   {
-    super(x, y, "charSelect/bfChill");
+    super(x, y, null);
 
     onAnimationComplete.add(function(animLabel:String) { //? changed the hook here
       switch (animLabel)

source/mikolka/vslice/freeplay/FreeplayState.hx

@@ -1996,11 +1996,13 @@ class FreeplayState extends MusicBeatSubstate
 				if (diffSprite != null && diffSprite.difficultyId == currentDifficulty)
 					return diffSprite;
 			}
-			throw "NO DIFF! Something is VERY wrong!";
+			trace("No DIFF! Perhaps it isn't available for this character...");
+			return null;
 		}
 
 		// ? This handles trans OUT
 		var diffObj = getCurrentDiff(); //
+		if(diffObj == null) return;
 		var diffSprite:DifficultySprite = diffObj;
 
 		if (transIn)