R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.21.1 into 1.21.3

Browse Source
This commit is contained in:
embeddedt 2024-11-29 16:42:59 -05:00
commit 1bb730b2b0
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/gradle.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
java-version: 21 java-version: 21
check-latest: true check-latest: true
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v3 uses: gradle/actions/setup-gradle@v4
with: with:
cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }} cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }}
gradle-home-cache-cleanup: true gradle-home-cache-cleanup: true

12
common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java
View File

@ -13,8 +13,7 @@ import me.lucko.spark.common.sampler.ThreadGrouper;
import me.lucko.spark.common.sampler.async.AsyncSampler; import me.lucko.spark.common.sampler.async.AsyncSampler;
import me.lucko.spark.common.sampler.async.SampleCollector; import me.lucko.spark.common.sampler.async.SampleCollector;
import me.lucko.spark.common.sampler.java.JavaSampler; import me.lucko.spark.common.sampler.java.JavaSampler;
import me.lucko.spark.common.sampler.node.MergeMode; import me.lucko.spark.common.sampler.java.MergeStrategy;
import me.lucko.spark.common.util.MethodDisambiguator;
import me.lucko.spark.lib.adventure.text.Component; import me.lucko.spark.lib.adventure.text.Component;
import me.lucko.spark.proto.SparkSamplerProtos; import me.lucko.spark.proto.SparkSamplerProtos;
import net.minecraft.SharedConstants; import net.minecraft.SharedConstants;
@ -42,7 +41,7 @@ public class SparkLaunchProfiler {
public static void start(String key) { public static void start(String key) {
if (!ongoingSamplers.containsKey(key)) { if (!ongoingSamplers.containsKey(key)) {
Sampler sampler; Sampler sampler;
SamplerSettings settings = new SamplerSettings(4000, ThreadDumper.ALL, ThreadGrouper.BY_NAME, -1, false); SamplerSettings settings = new SamplerSettings(4000, ThreadDumper.ALL, ThreadGrouper.BY_NAME.get(), -1, false);
try { try {
if(USE_JAVA_SAMPLER_FOR_LAUNCH) { if(USE_JAVA_SAMPLER_FOR_LAUNCH) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
@ -71,7 +70,7 @@ public class SparkLaunchProfiler {
SparkSamplerProtos.SamplerData output = sampler.toProto(platform, new Sampler.ExportProps() SparkSamplerProtos.SamplerData output = sampler.toProto(platform, new Sampler.ExportProps()
.creator(new CommandSender.Data(commandSender.getName(), commandSender.getUniqueId())) .creator(new CommandSender.Data(commandSender.getName(), commandSender.getUniqueId()))
.comment("Stage: " + key) .comment("Stage: " + key)
.mergeMode(() -> MergeMode.sameMethod(new MethodDisambiguator())) .mergeStrategy(MergeStrategy.SAME_METHOD)
.classSourceLookup(platform::createClassSourceLookup)); .classSourceLookup(platform::createClassSourceLookup));
try { try {
String urlKey = platform.getBytebinClient().postContent(output, "application/x-spark-sampler").key(); String urlKey = platform.getBytebinClient().postContent(output, "application/x-spark-sampler").key();
@ -95,6 +94,11 @@ public class SparkLaunchProfiler {
return ModernFixPlatformHooks.INSTANCE.getPlatformName(); return ModernFixPlatformHooks.INSTANCE.getPlatformName();
} }
@Override
public String getBrand() {
return this.getName();
}
@Override @Override
public String getVersion() { public String getVersion() {
return ModernFixPlatformHooks.INSTANCE.getVersionString(); return ModernFixPlatformHooks.INSTANCE.getVersionString();

2
gradle.properties
View File

@ -26,7 +26,7 @@ continuity_version=3.0.0-beta.4+1.20.2
modmenu_version=7.0.0-beta.2 modmenu_version=7.0.0-beta.2
diagonal_fences_version=4558828 diagonal_fences_version=4558828
spark_version=4587310 spark_version=5759671
use_fabric_api_at_runtime=false use_fabric_api_at_runtime=false

2
scripts/autorelease.sh
View File

@ -15,7 +15,7 @@ trap cleanup EXIT
echo "downloading temporary modernfix..." echo "downloading temporary modernfix..."
cd $WORK_DIR cd $WORK_DIR
git clone https://github.com/embeddedt/ModernFix mfix &>/dev/null git clone git@github.com:embeddedt/ModernFix.git mfix &>/dev/null
cd mfix cd mfix
# gather version list # gather version list

2
scripts/propagate.sh
View File

@ -16,7 +16,7 @@ trap "exit" INT
echo "downloading temporary modernfix..." echo "downloading temporary modernfix..."
cd $WORK_DIR cd $WORK_DIR
git clone https://github.com/embeddedt/ModernFix mfix &>/dev/null git clone git@github.com:embeddedt/ModernFix.git mfix &>/dev/null
cd mfix cd mfix
# gather version list # gather version list