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

Merge 1.18 into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2023-07-19 17:32:36 -04:00
commit 754e7741c7
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

@ -74,7 +74,8 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
this.bakery = bakery;
this.bakedCache = cache;
this.permanentOverrides = Collections.synchronizedMap(new Object2ObjectOpenHashMap<>());
currentInstance = this;
if(currentInstance == null)
currentInstance = this;
}
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;
import com.google.common.collect.ImmutableList;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.block.model.ItemTransforms;
@ -37,41 +36,41 @@ public class ItemOverrideBakedModel implements BakedModel {
@Override
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction direction, RandomSource random) {
return ImmutableList.of();
return getRealModel().getQuads(state, direction, random);
}
@Override
public boolean useAmbientOcclusion() {
return false;
return getRealModel().useAmbientOcclusion();
}
@Override
public boolean isGui3d() {
return false;
return getRealModel().isGui3d();
}
@Override
public boolean usesBlockLight() {
return false;
return getRealModel().usesBlockLight();
}
@Override
public boolean isCustomRenderer() {
return false;
return getRealModel().isCustomRenderer();
}
@Override
public TextureAtlasSprite getParticleIcon() {
return null;
return getRealModel().getParticleIcon();
}
@Override
public ItemTransforms getTransforms() {
return ItemTransforms.NO_TRANSFORMS;
return getRealModel().getTransforms();
}
@Override
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

@ -353,6 +353,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
this.topLevelModels.clear();
this.topLevelModels.put(MISSING_MODEL_LOCATION, this.missingModel);
this.smallLoadingCache.clear();
DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
}
/**

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

@ -211,6 +211,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
profiler.pop();
// ensure missing model is a permanent override
this.bakedTopLevelModels.put(MISSING_MODEL_LOCATION, this.bake(MISSING_MODEL_LOCATION, BlockModelRotation.X0_Y0, this.atlasSet::getSprite));
DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
cir.setReturnValue(atlasSet);
}