Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build script, fix shulker boxes, add shields #156

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

Roadhog360
Copy link

Now correct sound, rotation fixed

Now correct sound, rotation fixed
@Roadhog360
Copy link
Author

Might revert Quilt to 0.26.0, beta version seems unnecessary

Some parts of the shields working will require my upcoming PR for MultiItemLib
Textures are still borked, fix currently unknown
@Roadhog360 Roadhog360 changed the title Fix build script, fix shulker boxes Fix build script, fix shulker boxes, add shields Jun 26, 2024
@Roadhog360
Copy link
Author

Roadhog360 commented Jun 26, 2024

Feel free to ask me to remove the self-attribution upon request, these changes are ultimately small so I'd understand.

@Roadhog360
Copy link
Author

I'm also going to add ELYTRA back to Multi-Item-Lib as the Netherite Elytra registered as an elytra is causing a few issues, like cape still rendering and other checks for elytra failing. I'll fix this in MIL. I can make another PR for this and the MIL version bump if you push MIL to your maven

Basically temporary compile the jar so maven is not needed to test the new changes.
Elytra now extends ElytraItem and not ArmorItem, allowing for better compatibility. Instead we add stuff in so it is treated like armor by areas we want it to be.
Loom updates needed for MixinExtras

FOR SOME REASON THE DEBUG LAUNCHER NO LONGER WORKS
It's due to the loom update, I tracked it down to that individual change, but it is needed for MixinExtras. I'll look into it soon. I'm tired and have been fighting with this stupid error for 2 whole freaking hours...
@Roadhog360
Copy link
Author

So I decided to temporarily place MIL in libs and load it as a jar dependency so you don't need to do any manual work to test the new changes. So all you need to do if you accept the changes, is to simply change the buildscript to use the maven again and delete the jar. I can do this from my end if you want, just pull 1.6.3 MIL into your Maven and lmk to fix the dep setup

Also store the Identifier instances instead of making a new one every frame
Comment on lines 4 to 5
id 'com.oroarmor.general-gradle-plugin' version '1.2.3'
id 'com.oroarmor.minecraft-gradle-plugin' version '1.2.3'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
id 'com.oroarmor.general-gradle-plugin' version '1.2.3'
id 'com.oroarmor.minecraft-gradle-plugin' version '1.2.3'
id 'com.oroarmor.general-gradle-plugin' version '1.3.1'
id 'com.oroarmor.minecraft-gradle-plugin' version '1.3.1'

@@ -47,7 +47,7 @@ minecraftPublishing {
curseforgeId = "394120"
dependencies {
"multi-item-lib" {
version = "1.6.2"
version = "1.6.3"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
version = "1.6.3"
version = "1.7.0"

Comment on lines -90 to -95

LivingEntityFeatureRendererRegistrationCallback.EVENT.register(((EntityType<? extends LivingEntity> entityType, LivingEntityRenderer<?, ?> entityRenderer, LivingEntityFeatureRendererRegistrationCallback.RegistrationHelper registrationHelper, EntityRendererFactory.Context context) -> {
if (entityRenderer.getModel() instanceof PlayerEntityModel || entityRenderer.getModel() instanceof BipedEntityModel || entityRenderer.getModel() instanceof ArmorStandEntityModel) {
registrationHelper.register(new NetheriteElytraFeatureRenderer<>(entityRenderer, context.getModelLoader()));
}
}));
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ah thanks for getting rid of this, it was pretty hacky

@@ -39,9 +39,11 @@
import net.minecraft.util.Lazy;

public enum NetheriteElytraArmorMaterials implements ArmorMaterial {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think we should try to remove this.

public class NetheriteElytraItem extends ArmorItem implements FabricElytraItem {
import java.util.UUID;

public class NetheriteElytraItem extends ElytraItem implements FabricElytraItem {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does repairing this with netherite still work or is it back to phantom membrane?

modCompileOnly('com.github.CrimsonDawn45:Fabric-Shield-Lib:main-SNAPSHOT')
modImplementation "com.oroarmor:multi-item-lib:1.7.0"

modCompileOnly("com.github.CrimsonDawn45:Fabric-Shield-Lib:1.7.2-1.20.2")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this still being used?

@Roadhog360
Copy link
Author

I didn't notice you reviewed. I'll read soon, give me a day or two.

@OroArmor
Copy link
Collaborator

OroArmor commented Jul 6, 2024

I finished the review 5 days ago put forgot to actually send it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants