From a29bdb2f826ac40e417d22c4553937942404a750 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 12 Nov 2024 08:16:36 -0500 Subject: [PATCH 1/5] Fix standalone model variant not being loaded Related: #475 --- .../mixin/perf/dynamic_resources/ModelBakeryMixin.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java index 4d76363d..1f893d26 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java @@ -76,6 +76,8 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { @Shadow @Final public static ModelResourceLocation MISSING_MODEL_VARIANT; + @Shadow protected abstract void registerModelAndLoadDependencies(ModelResourceLocation modelLocation, UnbakedModel model); + private final Map mfix$emulatedBakedRegistry = new DynamicOverridableMap<>(ModelResourceLocation.class, this::loadBakedModelDynamic); @Override @@ -94,6 +96,9 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { } if(location.variant().equals("inventory")) { this.loadItemModelAndDependencies(location.id()); + } else if (location.variant().equals("fabric_resource") || location.variant().equals("standalone")) { + UnbakedModel unbakedModel = this.getModel(location.id()); + this.registerModelAndLoadDependencies(location, unbakedModel); } else { ((IBlockStateModelLoader)dynamicLoader).loadSpecificBlock(location); } From 520de2c12b510ee018fc6b2e2d74dac74a36b70b Mon Sep 17 00:00:00 2001 From: pietro-lopes <97140255+pietro-lopes@users.noreply.github.com> Date: Thu, 28 Nov 2024 10:46:29 -0300 Subject: [PATCH 2/5] updated spark (#484) --- .../modernfix/spark/SparkLaunchProfiler.java | 12 ++++++++---- gradle.properties | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java b/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java index 428a6586..67d30bcc 100644 --- a/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java +++ b/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java @@ -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.SampleCollector; import me.lucko.spark.common.sampler.java.JavaSampler; -import me.lucko.spark.common.sampler.node.MergeMode; -import me.lucko.spark.common.util.MethodDisambiguator; +import me.lucko.spark.common.sampler.java.MergeStrategy; import me.lucko.spark.lib.adventure.text.Component; import me.lucko.spark.proto.SparkSamplerProtos; import net.minecraft.SharedConstants; @@ -42,7 +41,7 @@ public class SparkLaunchProfiler { public static void start(String key) { if (!ongoingSamplers.containsKey(key)) { 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 { if(USE_JAVA_SAMPLER_FOR_LAUNCH) { throw new UnsupportedOperationException(); @@ -71,7 +70,7 @@ public class SparkLaunchProfiler { SparkSamplerProtos.SamplerData output = sampler.toProto(platform, new Sampler.ExportProps() .creator(new CommandSender.Data(commandSender.getName(), commandSender.getUniqueId())) .comment("Stage: " + key) - .mergeMode(() -> MergeMode.sameMethod(new MethodDisambiguator())) + .mergeStrategy(MergeStrategy.SAME_METHOD) .classSourceLookup(platform::createClassSourceLookup)); try { String urlKey = platform.getBytebinClient().postContent(output, "application/x-spark-sampler").key(); @@ -95,6 +94,11 @@ public class SparkLaunchProfiler { return ModernFixPlatformHooks.INSTANCE.getPlatformName(); } + @Override + public String getBrand() { + return this.getName(); + } + @Override public String getVersion() { return ModernFixPlatformHooks.INSTANCE.getVersionString(); diff --git a/gradle.properties b/gradle.properties index 1ab5311c..61b8f191 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ continuity_version=3.0.0-beta.4+1.20.2 modmenu_version=7.0.0-beta.2 diagonal_fences_version=4558828 -spark_version=4587310 +spark_version=5759671 use_fabric_api_at_runtime=false From 0bda3c9f43483bb8d809d1ff1044e1cb7d22c886 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Fri, 29 Nov 2024 16:40:29 -0500 Subject: [PATCH 3/5] Fix setup-gradle --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 923c0235..e6845138 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,7 +23,7 @@ jobs: java-version: 21 check-latest: true - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }} gradle-home-cache-cleanup: true From fffb1031f754d6751b23646ed6efeb64e5326002 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Fri, 29 Nov 2024 16:41:58 -0500 Subject: [PATCH 4/5] Propagate via SSH --- scripts/propagate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/propagate.sh b/scripts/propagate.sh index d5481e19..eb328c08 100755 --- a/scripts/propagate.sh +++ b/scripts/propagate.sh @@ -16,7 +16,7 @@ trap "exit" INT echo "downloading temporary modernfix..." 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 # gather version list From 8307564336acd73f1b9fea08eb9c1868aaaffd22 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Fri, 29 Nov 2024 16:42:36 -0500 Subject: [PATCH 5/5] Use SSH for propagators --- scripts/autorelease.sh | 2 +- scripts/propagate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/autorelease.sh b/scripts/autorelease.sh index 351fa25b..415d0776 100755 --- a/scripts/autorelease.sh +++ b/scripts/autorelease.sh @@ -15,7 +15,7 @@ trap cleanup EXIT echo "downloading temporary modernfix..." 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 # gather version list diff --git a/scripts/propagate.sh b/scripts/propagate.sh index eb328c08..dbd65d55 100755 --- a/scripts/propagate.sh +++ b/scripts/propagate.sh @@ -16,7 +16,7 @@ trap "exit" INT echo "downloading temporary modernfix..." cd $WORK_DIR -git clone git@github.com/embeddedt/ModernFix.git mfix &>/dev/null +git clone git@github.com:embeddedt/ModernFix.git mfix &>/dev/null cd mfix # gather version list