Fix build script, fix shulker boxes, add shields #156
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx2G | |
|
|
||
| # Quilt Properties | ||
| minecraft_version=1.20.1 | ||
| quilt_loader_version=0.26.0 | ||
|
|
||
| # Mod Properties | ||
| mod_version=2.2.1 | ||
| maven_group=com.oroarmor | ||
| archives_base_name=netherite-plus-mod | ||
| project_name=Netherite Plus Mod | ||
| discord_hook_image_url=https://raw.githubusercontent.com/OroArmorModding/Netherite-Plus-Mod/742eaf744ad79946d47ddc7b070ddbc90b05bb03/src/main/resources/assets/netherite_plus/icon.png | ||
|
|
||
| # Dependencies | ||
| qsl_version=6.1.1+1.20.1 | ||
| qfapi_version=7.5.0+0.92.2-1.20.1 | ||
| mappings=1.20.1+build.23 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip | ||
| networkTimeout=10000 | ||
| validateDistributionUrl=true | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,7 +95,7 @@ public static Identifier id(String id) { | |
|
|
||
| public static void registerItemsWithMultiItemLib() { | ||
| if (CONFIG.enabled.shields.value()) { | ||
| UniqueItemRegistry.SHIELD.addItemToRegistry(NETHERITE_SHIELD); | ||
| } | ||
| if (CONFIG.enabled.fishing_rod.value()) { | ||
| UniqueItemRegistry.FISHING_ROD.addItemToRegistry(NETHERITE_FISHING_ROD); | ||
|
|
@@ -106,5 +106,12 @@ public static void registerItemsWithMultiItemLib() { | |
| if (CONFIG.enabled.shears.value()) { | ||
| UniqueItemRegistry.SHEARS.addItemToRegistry(NETHERITE_SHEARS); | ||
| } | ||
| if (CONFIG.enabled.bows_and_crossbows.value()) { | ||
| UniqueItemRegistry.BOW.addItemToRegistry(NETHERITE_BOW); | ||
| UniqueItemRegistry.CROSSBOW.addItemToRegistry(NETHERITE_CROSSBOW); | ||
| } | ||
| if (CONFIG.enabled.elytra.value()) { | ||
| UniqueItemRegistry.ELYTRA.addItemToRegistry(NETHERITE_ELYTRA); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,23 +96,23 @@ private static Block register(String id, Block block) { | |
| } | ||
|
|
||
| private static void registerShulkerBoxBlocks() { | ||
| NETHERITE_SHULKER_BOX = register("netherite_shulker_box", createShulkerBoxBlock(null, AbstractBlock.Settings.create().mapColor(MapColor.GRAY).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_WHITE_SHULKER_BOX = register("netherite_white_shulker_box", createShulkerBoxBlock(DyeColor.WHITE, AbstractBlock.Settings.create().mapColor(MapColor.SNOW).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_ORANGE_SHULKER_BOX = register("netherite_orange_shulker_box", createShulkerBoxBlock(DyeColor.ORANGE, AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_MAGENTA_SHULKER_BOX = register("netherite_magenta_shulker_box", createShulkerBoxBlock(DyeColor.MAGENTA, AbstractBlock.Settings.create().mapColor(MapColor.MAGENTA).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_LIGHT_BLUE_SHULKER_BOX = register("netherite_light_blue_shulker_box", createShulkerBoxBlock(DyeColor.LIGHT_BLUE, AbstractBlock.Settings.create().mapColor(MapColor.LIGHT_BLUE).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_YELLOW_SHULKER_BOX = register("netherite_yellow_shulker_box", createShulkerBoxBlock(DyeColor.YELLOW, AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_LIME_SHULKER_BOX = register("netherite_lime_shulker_box", createShulkerBoxBlock(DyeColor.LIME, AbstractBlock.Settings.create().mapColor(MapColor.LIME).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_PINK_SHULKER_BOX = register("netherite_pink_shulker_box", createShulkerBoxBlock(DyeColor.PINK, AbstractBlock.Settings.create().mapColor(MapColor.PINK).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_GRAY_SHULKER_BOX = register("netherite_gray_shulker_box", createShulkerBoxBlock(DyeColor.GRAY, AbstractBlock.Settings.create().mapColor(MapColor.GRAY).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_LIGHT_GRAY_SHULKER_BOX = register("netherite_light_gray_shulker_box", createShulkerBoxBlock(DyeColor.LIGHT_GRAY, AbstractBlock.Settings.create().mapColor(MapColor.LIGHT_GRAY).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_CYAN_SHULKER_BOX = register("netherite_cyan_shulker_box", createShulkerBoxBlock(DyeColor.CYAN, AbstractBlock.Settings.create().mapColor(MapColor.CYAN).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_PURPLE_SHULKER_BOX = register("netherite_purple_shulker_box", createShulkerBoxBlock(DyeColor.PURPLE, AbstractBlock.Settings.create().mapColor(MapColor.PURPLE).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_BLUE_SHULKER_BOX = register("netherite_blue_shulker_box", createShulkerBoxBlock(DyeColor.BLUE, AbstractBlock.Settings.create().mapColor(MapColor.BLUE).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_BROWN_SHULKER_BOX = register("netherite_brown_shulker_box", createShulkerBoxBlock(DyeColor.BROWN, AbstractBlock.Settings.create().mapColor(MapColor.BROWN).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_GREEN_SHULKER_BOX = register("netherite_green_shulker_box", createShulkerBoxBlock(DyeColor.GREEN, AbstractBlock.Settings.create().mapColor(MapColor.GREEN).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_RED_SHULKER_BOX = register("netherite_red_shulker_box", createShulkerBoxBlock(DyeColor.RED, AbstractBlock.Settings.create().mapColor(MapColor.RED).sounds(BlockSoundGroup.NETHERITE))); | ||
| NETHERITE_BLACK_SHULKER_BOX = register("netherite_black_shulker_box", createShulkerBoxBlock(DyeColor.BLACK, AbstractBlock.Settings.create().mapColor(MapColor.BLACK).sounds(BlockSoundGroup.NETHERITE))); | ||
|
|
||
| NETHERITE_SHULKER_BOX_ENTITY = Registry.register(Registries.BLOCK_ENTITY_TYPE, id("netherite_shulker_box"), | ||
| BlockEntityType.Builder.create(NetheriteShulkerBoxBlockEntity::new, | ||
|
|
@@ -140,4 +140,4 @@ private static NetheriteShulkerBoxBlock createShulkerBoxBlock(DyeColor color, Ab | |
| ); | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,39 +24,29 @@ | |
|
|
||
| package com.oroarmor.netherite_plus.client; | ||
|
|
||
| import com.oroarmor.netherite_plus.NetheritePlusMod; | ||
| import com.oroarmor.netherite_plus.block.NetheritePlusBlocks; | ||
| import com.oroarmor.netherite_plus.client.render.NetheriteBeaconBlockEntityRenderer; | ||
| import com.oroarmor.netherite_plus.client.render.NetheritePlusBuiltinItemModelRenderer; | ||
| import com.oroarmor.netherite_plus.client.render.NetheriteShulkerBoxBlockEntityRenderer; | ||
| import com.oroarmor.netherite_plus.item.NetheritePlusItems; | ||
| import com.oroarmor.netherite_plus.network.LavaVisionUpdatePacket; | ||
| import com.oroarmor.netherite_plus.screen.NetheritePlusScreenHandlers; | ||
| import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry; | ||
| import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry; | ||
| import net.minecraft.client.MinecraftClient; | ||
| import net.minecraft.client.render.RenderLayer; | ||
| import net.minecraft.resource.ResourceType; | ||
| import org.quiltmc.loader.api.ModContainer; | ||
| import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer; | ||
| import org.quiltmc.qsl.block.extensions.api.client.BlockRenderLayerMap; | ||
| import org.quiltmc.qsl.networking.api.client.ClientPlayConnectionEvents; | ||
| import org.quiltmc.qsl.networking.api.client.ClientPlayNetworking; | ||
| import org.quiltmc.qsl.resource.loader.api.ResourceLoader; | ||
|
|
||
| import java.util.LinkedList; | ||
| import java.util.Queue; | ||
|
|
||
| import static com.oroarmor.netherite_plus.NetheritePlusMod.id; | ||
|
|
||
| public class NetheritePlusClientMod implements ClientModInitializer { | ||
|
|
@@ -87,12 +77,6 @@ public void onInitializeClient(ModContainer mod) { | |
| if (NetheritePlusMod.CONFIG.enabled.beacon.value()) { | ||
| BlockRenderLayerMap.put(RenderLayer.getCutout(), NetheritePlusBlocks.NETHERITE_BEACON); | ||
| } | ||
|
Comment on lines
-90
to
-95
There was a problem hiding this comment. Ah thanks for getting rid of this, it was pretty hacky |
||
| } | ||
|
|
||
| public static void registerBuiltinItemRenderers(MinecraftClient client) { | ||
|
|
@@ -122,10 +106,10 @@ public static void registerBuiltinItemRenderers(MinecraftClient client) { | |
| } | ||
|
|
||
| if (NetheritePlusMod.CONFIG.enabled.shields.value()) { | ||
| BuiltinItemRendererRegistry.INSTANCE.register(NetheritePlusItems.NETHERITE_SHIELD, dynamicItemRenderer); | ||
| } | ||
| if (NetheritePlusMod.CONFIG.enabled.trident.value()) { | ||
| BuiltinItemRendererRegistry.INSTANCE.register(NetheritePlusItems.NETHERITE_TRIDENT, dynamicItemRenderer); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -109,7 +109,7 @@ public static void registerItemsWithModelProvider() { | |
| } | ||
|
|
||
| if (NetheritePlusMod.CONFIG.enabled.shields.value()) { | ||
| registerShieldModels(); | ||
| } | ||
|
|
||
| if (NetheritePlusMod.CONFIG.enabled.fishing_rod.value()) { | ||
|
|
@@ -137,4 +137,4 @@ private static void registerTridentModels() { | |
| return livingEntity != null && livingEntity.isUsingItem() && livingEntity.getActiveItem() == itemStack ? 1.0F : 0.0F; | ||
| }); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,11 +33,11 @@ | |
| public class NetheritePlusTextures { | ||
| public static final Identifier NETHERITE_SHULKER_BOXES_ATLAS_TEXTURE = id("textures/atlas/netherite_shulker_boxes.png"); | ||
| public static final Identifier NETHERITE_SHIELD_PATTERNS_ATLAS_TEXTURE = id("textures/atlas/netherite_shield_patterns.png"); | ||
| public static final Identifier NETHERITE_ELYTRA_SKIN = id("textures/entity/netherite_elytra.png"); | ||
| public static final Identifier NETHERITE_SHIELD_TEXTURE = id("textures/entity/netherite_shield_base.png"); | ||
| public static final Identifier NETHERITE_SHIELD_TEXTURE_NOPATTERN = id("textures/entity/netherite_shield_base_nopattern.png"); | ||
| public static final Identifier NETHERITE_TRIDENT_TEXTURE = id("textures/entity/netherite_trident.png"); | ||
|
|
||
| //Shields with patterns need an atlas, supposedly | ||
| public static final Material NETHERITE_SHIELD_BASE = new Material(NETHERITE_SHIELD_PATTERNS_ATLAS_TEXTURE, id("entity/netherite_shield_base")); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.