Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Feature/armor#171

Merged
TheGlitch76 merged 8 commits intomasterfrom
feature/armor
Aug 19, 2020
Merged

Feature/armor#171
TheGlitch76 merged 8 commits intomasterfrom
feature/armor

Conversation

@rikka0w0
Copy link
Contributor

@rikka0w0 rikka0w0 commented Aug 4, 2020

Implements callbacks in IForgeItem:

  1. onArmorTick
  2. getArmorTexture
  3. getArmorModel

Copy link
Member

@TheGlitch76 TheGlitch76 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

overall looks good, just some small nitpicks

* @param type Subtype, can be null or "overlay"
* @return ResourceLocation pointing at the armor's texture
*/
public Identifier getArmorResource(Entity entity, ItemStack stack, EquipmentSlot slot, @Nullable String type) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interface or @unique

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is a forge callback, so I'm going to add it to an interface

s1 = PatchworkArmorItemHandler.getArmorTexture(entity, stack, s1, slot, type);
Identifier resourcelocation = (Identifier) ARMOR_TEXTURE_CACHE.get(s1);

if (resourcelocation == null) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove MCP please

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed

@rikka0w0
Copy link
Contributor Author

rikka0w0 commented Aug 5, 2020

checkLicense failed due to

* What went wrong:
Execution failed for task ':patchwork-networking-messages:checkLicenseMain'.
> License violations were found: src/main/java/net/patchworkmc/impl/networking/PatchworkPlayNetworkingMessagesClient.java

@TheGlitch76
Copy link
Member

Merging with master should fix the license check.

@TheGlitch76
Copy link
Member

Merge conflicts

Conflicts:
	patchwork-god-classes/build.gradle
	patchwork-god-classes/src/main/resources/fabric.mod.json
Conflicts:
	patchwork-god-classes/build.gradle
Copy link
Member

@TheGlitch76 TheGlitch76 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@TheGlitch76 TheGlitch76 merged commit ea0ad1b into master Aug 19, 2020
@TheGlitch76 TheGlitch76 deleted the feature/armor branch August 19, 2020 01:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants