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

Merge 1.19.2 into 1.19.4

Browse Source
This commit is contained in:
embeddedt 2023-07-19 17:34:38 -04:00
commit 5994edcf17
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
View File

@ -75,7 +75,8 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
this.bakery = bakery; this.bakery = bakery;
this.bakedCache = cache; this.bakedCache = cache;
this.permanentOverrides = Collections.synchronizedMap(new Object2ObjectOpenHashMap<>()); this.permanentOverrides = Collections.synchronizedMap(new Object2ObjectOpenHashMap<>());
currentInstance = this; if(currentInstance == null)
currentInstance = this;
} }
public void setMissingModel(BakedModel model) { public void setMissingModel(BakedModel model) {

17
common/src/main/java/org/embeddedt/modernfix/dynamicresources/ItemOverrideBakedModel.java
View File

@ -1,6 +1,5 @@
package org.embeddedt.modernfix.dynamicresources; package org.embeddedt.modernfix.dynamicresources;
import com.google.common.collect.ImmutableList;
import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemOverrides; import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.block.model.ItemTransforms;
@ -37,41 +36,41 @@ public class ItemOverrideBakedModel implements BakedModel {
@Override @Override
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction direction, RandomSource random) { public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction direction, RandomSource random) {
return ImmutableList.of(); return getRealModel().getQuads(state, direction, random);
} }
@Override @Override
public boolean useAmbientOcclusion() { public boolean useAmbientOcclusion() {
return false; return getRealModel().useAmbientOcclusion();
} }
@Override @Override
public boolean isGui3d() { public boolean isGui3d() {
return false; return getRealModel().isGui3d();
} }
@Override @Override
public boolean usesBlockLight() { public boolean usesBlockLight() {
return false; return getRealModel().usesBlockLight();
} }
@Override @Override
public boolean isCustomRenderer() { public boolean isCustomRenderer() {
return false; return getRealModel().isCustomRenderer();
} }
@Override @Override
public TextureAtlasSprite getParticleIcon() { public TextureAtlasSprite getParticleIcon() {
return null; return getRealModel().getParticleIcon();
} }
@Override @Override
public ItemTransforms getTransforms() { public ItemTransforms getTransforms() {
return ItemTransforms.NO_TRANSFORMS; return getRealModel().getTransforms();
} }
@Override @Override
public ItemOverrides getOverrides() { public ItemOverrides getOverrides() {
return null; return getRealModel().getOverrides();
} }
} }

1
fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -173,6 +173,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
private void captureGetter(BiFunction<ResourceLocation, Material, TextureAtlasSprite> getter, CallbackInfo ci) { private void captureGetter(BiFunction<ResourceLocation, Material, TextureAtlasSprite> getter, CallbackInfo ci) {
this.ignoreModelLoad = false; this.ignoreModelLoad = false;
textureGetter = getter; textureGetter = getter;
DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
} }
@Redirect(method = "bakeModels", at = @At(value = "INVOKE", target = "Ljava/util/Map;keySet()Ljava/util/Set;")) @Redirect(method = "bakeModels", at = @At(value = "INVOKE", target = "Ljava/util/Map;keySet()Ljava/util/Set;"))

1
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -150,6 +150,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
@Inject(method = "bakeModels", at = @At("HEAD")) @Inject(method = "bakeModels", at = @At("HEAD"))
private void storeTextureGetter(BiFunction<ResourceLocation, Material, TextureAtlasSprite> getter, CallbackInfo ci) { private void storeTextureGetter(BiFunction<ResourceLocation, Material, TextureAtlasSprite> getter, CallbackInfo ci) {
textureGetter = getter; textureGetter = getter;
DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
} }
@Redirect(method = "bakeModels", at = @At(value = "INVOKE", target = "Ljava/util/Map;keySet()Ljava/util/Set;")) @Redirect(method = "bakeModels", at = @At(value = "INVOKE", target = "Ljava/util/Map;keySet()Ljava/util/Set;"))