MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to BCLib 0.3.0

Browse source
This commit is contained in:
paulevsGitch 2021-07-20 00:39:58 +03:00
parent 1a52251af0
commit b2431153dc
294 changed files with 7484 additions and 1440 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/shadow/fabric/api/client/rendering/v1/ArmorRenderingRegistry.java
View file

@ -100,7 +100,10 @@ public final class ArmorRenderingRegistry {
*/
public static void registerSimpleTexture(ResourceLocation identifier, Item... items) {
registerTexture((entity, stack, slot, secondLayer, suffix, defaultTexture) -> {
return new ResourceLocation(identifier.getNamespace(), "textures/models/armor/" + identifier.getPath() + "_layer_" + (secondLayer ? 2 : 1) + (suffix == null ? "" : "_" + suffix) + ".png");
return new ResourceLocation(
identifier.getNamespace(),
"textures/models/armor/" + identifier.getPath() + "_layer_" + (secondLayer ? 2 : 1) + (suffix == null ? "" : "_" + suffix) + ".png"
);
}, items);
}

16
src/main/java/shadow/fabric/mixin/client/rendering/MixinArmorFeatureRenderer.java
View file

@ -89,7 +89,12 @@ public abstract class MixinArmorFeatureRenderer extends RenderLayer {
ItemStack stack = storedEntity.getItemBySlot(slot);
HumanoidModel<LivingEntity> defaultModel = cir.getReturnValue();
HumanoidModel<LivingEntity> model = ArmorRenderingRegistry.getArmorModel(storedEntity, stack, slot, defaultModel);
HumanoidModel<LivingEntity> model = ArmorRenderingRegistry.getArmorModel(
storedEntity,
stack,
slot,
defaultModel
);
if (model != defaultModel) {
cir.setReturnValue(model);
@ -98,7 +103,14 @@ public abstract class MixinArmorFeatureRenderer extends RenderLayer {
@Inject(method = "getArmorLocation", at = @At(value = "INVOKE", target = "Ljava/util/Map;computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;"), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD)
private void getArmorTexture(ArmorItem armorItem, boolean secondLayer, /* @Nullable */ String suffix, CallbackInfoReturnable<ResourceLocation> cir, String vanillaIdentifier) {
String texture = ArmorRenderingRegistry.getArmorTexture(storedEntity, storedEntity.getItemBySlot(storedSlot), storedSlot, secondLayer, suffix, new ResourceLocation(vanillaIdentifier)).toString();
String texture = ArmorRenderingRegistry.getArmorTexture(
storedEntity,
storedEntity.getItemBySlot(storedSlot),
storedSlot,
secondLayer,
suffix,
new ResourceLocation(vanillaIdentifier)
).toString();
if (!Objects.equals(texture, vanillaIdentifier)) {
cir.setReturnValue(ARMOR_LOCATION_CACHE.computeIfAbsent(texture, ResourceLocation::new));