diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelBakeryMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelBakeryMixin.java index 30522667..267e5825 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelBakeryMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelBakeryMixin.java @@ -27,6 +27,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; +import static org.embeddedt.modernfix.ModernFix.LOGGER; + @Mixin(ModelBakery.class) public abstract class ModelBakeryMixin { @Shadow @Final private Map topLevelModels; @@ -35,8 +37,6 @@ public abstract class ModelBakeryMixin { @Shadow @Deprecated @Nullable public abstract IBakedModel bake(ResourceLocation pLocation, IModelTransform pTransform); - @Shadow @Final private static Logger LOGGER; - @Shadow private Map> atlasPreparations; @Shadow @Nullable private SpriteMap atlasSet; @@ -78,7 +78,7 @@ public abstract class ModelBakeryMixin { })); List> serialModels = this.modelsToBakeParallel.get(false); List> parallelModels = this.modelsToBakeParallel.get(true); - ModernFix.LOGGER.debug("Collected " + LOGGER.debug("Collected " + serialModels.size() + " serial models, " + parallelModels.size() diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/parallelize_model_loading/ModelBakeryMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/parallelize_model_loading/ModelBakeryMixin.java index 7c30e699..f00197f0 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/parallelize_model_loading/ModelBakeryMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/parallelize_model_loading/ModelBakeryMixin.java @@ -150,36 +150,6 @@ public abstract class ModelBakeryMixin { useModelCache = false; } - @Redirect(method = "processLoading", at = @At(value = "INVOKE", target = "Ljava/util/stream/Stream;collect(Ljava/util/stream/Collector;)Ljava/lang/Object;", ordinal = 0), remap = false) - private Object collectTexturesParallel(Stream instance, Collector arCollector) { - ModernFix.LOGGER.warn("Collecting textures in parallel..."); - Stopwatch stopwatch = Stopwatch.createStarted(); - ConcurrentHashMap threadedunbakedCache = new ConcurrentHashMap<>(this.unbakedCache); - Function safeUnbakedGetter = (location) -> { - IUnbakedModel candidate = threadedunbakedCache.get(location); - if(candidate == null) { - synchronized (this.unbakedCache) { - candidate = this.getModel(location); - threadedunbakedCache.put(location, candidate); - } - } - return candidate; - }; - Set> set = Collections.synchronizedSet(Sets.newLinkedHashSet()); - String modelMissingString = MISSING_MODEL_LOCATION.toString(); - Set materials = this.topLevelModels.values().parallelStream().flatMap((unbaked) -> { - return unbaked.getMaterials(safeUnbakedGetter, set).stream(); - }).collect(Collectors.toSet()); - set.stream().filter((stringPair) -> { - return !stringPair.getSecond().equals(modelMissingString); - }).forEach((textureReferenceErrors) -> { - ModernFix.LOGGER.warn("Unable to resolve texture reference: {} in {}", textureReferenceErrors.getFirst(), textureReferenceErrors.getSecond()); - }); - ModernFix.LOGGER.warn("Collecting textures took " + stopwatch.elapsed(TimeUnit.MILLISECONDS)/1000f + " seconds"); - stopwatch.stop(); - return materials; - } - private List replacementList = null; @Redirect(method = "loadModel", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/IResourceManager;getResources(Lnet/minecraft/util/ResourceLocation;)Ljava/util/List;", ordinal = 0))