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

Removed color provider

Browse source
This commit is contained in:
paulevsGitch 2021-07-10 16:25:34 +03:00
parent 2c8862a37b
commit 4040597a6d
475 changed files with 5411 additions and 7521 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,7 @@ import java.util.Arrays;
public final class ArmorRenderingRegistry {
private ArmorRenderingRegistry() {
}
/**
* Registers a provider for custom armor models for an item.
*
@ -61,7 +61,7 @@ public final class ArmorRenderingRegistry {
public static void registerModel(@Nullable ModelProvider provider, Item... items) {
registerModel(provider, Arrays.asList(items));
}
/**
* Registers a provider for custom armor models for an item.
*
@ -71,7 +71,7 @@ public final class ArmorRenderingRegistry {
public static void registerModel(@Nullable ModelProvider provider, Iterable<Item> items) {
ArmorRenderingRegistryImpl.registerModel(provider, items);
}
/**
* Registers a provider for custom texture models for an item.
*
@ -81,7 +81,7 @@ public final class ArmorRenderingRegistry {
public static void registerTexture(@Nullable TextureProvider provider, Item... items) {
registerTexture(provider, Arrays.asList(items));
}
/**
* Registers a provider for custom texture models for an item.
*
@ -91,7 +91,7 @@ public final class ArmorRenderingRegistry {
public static void registerTexture(@Nullable TextureProvider provider, Iterable<Item> items) {
ArmorRenderingRegistryImpl.registerTexture(provider, items);
}
/**
* Register simple armor items to use the vanilla armor file name under the mods namespace.
*
@ -103,7 +103,7 @@ public final class ArmorRenderingRegistry {
return new ResourceLocation(identifier.getNamespace(), "textures/models/armor/" + identifier.getPath() + "_layer_" + (secondLayer ? 2 : 1) + (suffix == null ? "" : "_" + suffix) + ".png");
}, items);
}
/**
* Gets the model of the armor piece.
*
@ -117,7 +117,7 @@ public final class ArmorRenderingRegistry {
public static HumanoidModel<LivingEntity> getArmorModel(LivingEntity entity, ItemStack stack, EquipmentSlot slot, HumanoidModel<LivingEntity> defaultModel) {
return ArmorRenderingRegistryImpl.getArmorModel(entity, stack, slot, defaultModel);
}
/**
* Gets the armor texture {@link net.minecraft.resources.ResourceLocation}.
*
@ -133,7 +133,7 @@ public final class ArmorRenderingRegistry {
public static ResourceLocation getArmorTexture(LivingEntity entity, ItemStack stack, EquipmentSlot slot, boolean secondLayer, @Nullable String suffix, ResourceLocation defaultTexture) {
return ArmorRenderingRegistryImpl.getArmorTexture(entity, stack, slot, secondLayer, suffix, defaultTexture);
}
@FunctionalInterface
@Environment(EnvType.CLIENT)
public interface ModelProvider {
@ -146,10 +146,9 @@ public final class ArmorRenderingRegistry {
* @param defaultModel The default vanilla armor model
* @return The model of the armor piece. Should never be null.
*/
@NotNull
HumanoidModel<LivingEntity> getArmorModel(LivingEntity entity, ItemStack stack, EquipmentSlot slot, HumanoidModel<LivingEntity> defaultModel);
@NotNull HumanoidModel<LivingEntity> getArmorModel(LivingEntity entity, ItemStack stack, EquipmentSlot slot, HumanoidModel<LivingEntity> defaultModel);
}
@FunctionalInterface
@Environment(EnvType.CLIENT)
public interface TextureProvider {
@ -162,7 +161,6 @@ public final class ArmorRenderingRegistry {
* @param defaultTexture The default vanilla texture identifier
* @return the custom armor texture identifier. Should never be null.
*/
@NotNull
ResourceLocation getArmorTexture(LivingEntity entity, ItemStack stack, EquipmentSlot slot, boolean secondLayer, @Nullable String suffix, ResourceLocation defaultTexture);
@NotNull ResourceLocation getArmorTexture(LivingEntity entity, ItemStack stack, EquipmentSlot slot, boolean secondLayer, @Nullable String suffix, ResourceLocation defaultTexture);
}
}

12
src/main/java/shadow/fabric/impl/client/rendering/ArmorProviderExtensions.java
View file

@ -25,13 +25,11 @@ import org.jetbrains.annotations.Nullable;
import shadow.fabric.api.client.rendering.v1.ArmorRenderingRegistry;
public interface ArmorProviderExtensions {
@Nullable
ArmorRenderingRegistry.ModelProvider fabric_getArmorModelProvider();
@Nullable
ArmorRenderingRegistry.TextureProvider fabric_getArmorTextureProvider();
@Nullable ArmorRenderingRegistry.ModelProvider fabric_getArmorModelProvider();
@Nullable ArmorRenderingRegistry.TextureProvider fabric_getArmorTextureProvider();
void fabric_setArmorModelProvider(@Nullable ArmorRenderingRegistry.ModelProvider provider);
void fabric_setArmorTextureProvider(@Nullable ArmorRenderingRegistry.TextureProvider provider);
}

24
src/main/java/shadow/fabric/impl/client/rendering/ArmorRenderingRegistryImpl.java
View file

@ -35,48 +35,48 @@ import java.util.Objects;
public final class ArmorRenderingRegistryImpl {
private ArmorRenderingRegistryImpl() {
}
public static void registerModel(ArmorRenderingRegistry.ModelProvider provider, Iterable<Item> items) {
Objects.requireNonNull(items);
for (Item item : items) {
Objects.requireNonNull(item);
((ArmorProviderExtensions) item).fabric_setArmorModelProvider(provider);
}
}
public static void registerTexture(ArmorRenderingRegistry.TextureProvider provider, Iterable<Item> items) {
Objects.requireNonNull(items);
for (Item item : items) {
Objects.requireNonNull(item);
((ArmorProviderExtensions) item).fabric_setArmorTextureProvider(provider);
}
}
public static HumanoidModel<LivingEntity> getArmorModel(LivingEntity entity, ItemStack stack, EquipmentSlot slot, HumanoidModel<LivingEntity> defaultModel) {
if (!stack.isEmpty()) {
ArmorRenderingRegistry.ModelProvider provider = ((ArmorProviderExtensions) stack.getItem()).fabric_getArmorModelProvider();
if (provider != null) {
return provider.getArmorModel(entity, stack, slot, defaultModel);
}
}
return defaultModel;
}
public static ResourceLocation getArmorTexture(LivingEntity entity, ItemStack stack, EquipmentSlot slot, boolean secondLayer, @Nullable String suffix, ResourceLocation defaultTexture) {
if (!stack.isEmpty()) {
ArmorRenderingRegistry.TextureProvider provider = ((ArmorProviderExtensions) stack.getItem()).fabric_getArmorTextureProvider();
if (provider != null) {
return provider.getArmorTexture(entity, stack, slot, secondLayer, suffix, defaultTexture);
}
}
return defaultTexture;
}
}

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

@ -54,52 +54,52 @@ public abstract class MixinArmorFeatureRenderer extends RenderLayer {
@Shadow
@Final
private static Map<String, ResourceLocation> ARMOR_LOCATION_CACHE;
public MixinArmorFeatureRenderer(RenderLayerParent context) {
super(context);
}
@Unique
private LivingEntity storedEntity;
@Unique
private EquipmentSlot storedSlot;
@Inject(method = "render", at = @At("HEAD"))
private void storeEntity(PoseStack matrixStack, MultiBufferSource vertexConsumerProvider, int i, LivingEntity livingEntity, float f, float g, float h, float j, float k, float l, CallbackInfo ci) {
// We store the living entity wearing the armor before we render
this.storedEntity = livingEntity;
}
@Inject(method = "renderArmorPiece", at = @At("HEAD"))
private void storeSlot(PoseStack matrices, MultiBufferSource vertexConsumers, LivingEntity livingEntity, EquipmentSlot slot, int i, HumanoidModel bipedEntityModel, CallbackInfo ci) {
// We store the current armor slot that is rendering before we render each armor piece
this.storedSlot = slot;
}
@Inject(method = "render", at = @At("RETURN"))
private void removeStored(PoseStack matrixStack, MultiBufferSource vertexConsumerProvider, int i, LivingEntity livingEntity, float f, float g, float h, float j, float k, float l, CallbackInfo ci) {
// We remove the stored data after we render
this.storedEntity = null;
this.storedSlot = null;
}
@Inject(method = "getArmorModel", at = @At("RETURN"), cancellable = true)
private void selectArmorModel(EquipmentSlot slot, CallbackInfoReturnable<HumanoidModel<LivingEntity>> cir) {
ItemStack stack = storedEntity.getItemBySlot(slot);
HumanoidModel<LivingEntity> defaultModel = cir.getReturnValue();
HumanoidModel<LivingEntity> model = ArmorRenderingRegistry.getArmorModel(storedEntity, stack, slot, defaultModel);
if (model != defaultModel) {
cir.setReturnValue(model);
}
}
@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();
if (!Objects.equals(texture, vanillaIdentifier)) {
cir.setReturnValue(ARMOR_LOCATION_CACHE.computeIfAbsent(texture, ResourceLocation::new));
}

8
src/main/java/shadow/fabric/mixin/client/rendering/MixinItem.java
View file

@ -34,22 +34,22 @@ public class MixinItem implements ArmorProviderExtensions {
private ArmorRenderingRegistry.ModelProvider armorModelProvider;
@Unique
private ArmorRenderingRegistry.TextureProvider armorTextureProvider;
@Override
public ArmorRenderingRegistry.ModelProvider fabric_getArmorModelProvider() {
return armorModelProvider;
}
@Override
public ArmorRenderingRegistry.TextureProvider fabric_getArmorTextureProvider() {
return armorTextureProvider;
}
@Override
public void fabric_setArmorModelProvider(ArmorRenderingRegistry.ModelProvider provider) {
armorModelProvider = provider;
}
@Override
public void fabric_setArmorTextureProvider(ArmorRenderingRegistry.TextureProvider provider) {
armorTextureProvider = provider;