From 7fdf13dd021148731ad3d92b955ee089d34dc9ca Mon Sep 17 00:00:00 2001 From: ionutsoran Date: Fri, 20 Dec 2024 17:12:03 +0200 Subject: [PATCH] fix (karkinos_claw, armor_renderer): Removed conflicting features with syntra --- build.gradle | 5 +- gradle.properties | 1 - .../aquatic/mixin/client/InGameHudMixin.java | 6 +- .../hybridlabs/aquatic/HybridAquaticClient.kt | 12 +- .../render/armor/DivingArmorRenderer.kt | 22 +- .../render/armor/ManglerfishArmorRenderer.kt | 22 +- .../render/armor/SeashellArmorRenderer.kt | 22 +- .../render/armor/TurtleArmorRenderer.kt | 22 +- .../aquatic/mixin/LivingEntityMixin.java | 62 +++--- .../aquatic/mixin/PlayerEntityMixin.java | 58 ++--- .../aquatic/data/client/LanguageProvider.kt | 26 +-- .../aquatic/data/client/ModelProvider.kt | 22 +- .../data/server/AdvancementProvider.kt | 194 ++++++++-------- .../aquatic/data/server/RecipeProvider.kt | 124 +++++------ .../loot/EntityTypeLootTableProvider.kt | 60 ++--- .../server/loot/GenericLootTableProvider.kt | 4 +- .../data/server/tag/ItemTagProvider.kt | 66 +++--- .../aquatic/item/DivingArmorItem.kt | 62 +++--- .../aquatic/item/HybridAquaticItemGroups.kt | 26 +-- .../aquatic/item/HybridAquaticItems.kt | 210 +++++++++--------- .../aquatic/item/KarkinosClawItem.kt | 60 ++--- 21 files changed, 542 insertions(+), 544 deletions(-) diff --git a/build.gradle b/build.gradle index 13ddb9926..6811a0d28 100644 --- a/build.gradle +++ b/build.gradle @@ -28,12 +28,12 @@ repositories { name = "Geckolib" url = "https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/" } - + maven { name = "JamiesWhiteShirt" url = "https://maven.jamieswhiteshirt.com/libs-release/" } - + maven { name = "Modrinth" url = "https://api.modrinth.com/maven/" @@ -70,7 +70,6 @@ dependencies { modRuntimeOnly "io.github.flemmli97:debugutils:$minecraft_version-$debug_utils_version-fabric" modRuntimeOnly "maven.modrinth:carpet:$carpet_version" - include modImplementation("com.jamieswhiteshirt:reach-entity-attributes:$reach_entity_attributes_version") } loom { diff --git a/gradle.properties b/gradle.properties index c5deec31a..64f3b8e90 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,6 @@ mod_menu_version=7.2.2 geckolib_version=1.20.1:4.4.4 debug_utils_version=1.0.5 carpet_version=1.4.112 -reach_entity_attributes_version=2.4.0 # Meta mod_id=hybrid-aquatic diff --git a/src/client/java/dev/hybridlabs/aquatic/mixin/client/InGameHudMixin.java b/src/client/java/dev/hybridlabs/aquatic/mixin/client/InGameHudMixin.java index 8579e5116..77e2ac5ec 100644 --- a/src/client/java/dev/hybridlabs/aquatic/mixin/client/InGameHudMixin.java +++ b/src/client/java/dev/hybridlabs/aquatic/mixin/client/InGameHudMixin.java @@ -29,9 +29,9 @@ private void onRender(DrawContext context, float tickDelta, CallbackInfo ci) { if (player != null && client.options.getPerspective().isFirstPerson()) { ItemStack helmet = player.getInventory().getArmorStack(3); - if (helmet.getItem() == HybridAquaticItems.INSTANCE.getDIVING_HELMET()) { - renderDivingHelmetOverlay(context); - } +// if (helmet.getItem() == HybridAquaticItems.INSTANCE.getDIVING_HELMET()) { +// renderDivingHelmetOverlay(context); +// } } if (player != null && player.hasStatusEffect(HybridAquaticStatusEffects.INSTANCE.getINKED())) { renderInkedOverlay(context); diff --git a/src/client/kotlin/dev/hybridlabs/aquatic/HybridAquaticClient.kt b/src/client/kotlin/dev/hybridlabs/aquatic/HybridAquaticClient.kt index 4bec2735e..844608afa 100644 --- a/src/client/kotlin/dev/hybridlabs/aquatic/HybridAquaticClient.kt +++ b/src/client/kotlin/dev/hybridlabs/aquatic/HybridAquaticClient.kt @@ -72,12 +72,12 @@ object HybridAquaticClient : ClientModInitializer { } private fun registerGeoRenderers() { - GeoRenderProviderStorage.divingArmorRenderProvider = createBasicRenderProvider(::DivingArmorRenderer) - GeoRenderProviderStorage.seashellArmorRenderProvider = createBasicRenderProvider(::SeashellArmorRenderer) - GeoRenderProviderStorage.manglerfishArmorRenderProvider = createBasicRenderProvider(::ManglerfishArmorRenderer) - GeoRenderProviderStorage.turtleArmorRenderProvider = createBasicRenderProvider(::TurtleArmorRenderer) - GeoRenderProviderStorage.eelArmorRenderProvider = createBasicRenderProvider(::EelArmorRenderer) - GeoRenderProviderStorage.moonjellyfishArmorRenderProvider = createBasicRenderProvider(::MoonJellyfishArmorRenderer) +// GeoRenderProviderStorage.divingArmorRenderProvider = createBasicRenderProvider(::DivingArmorRenderer) +// GeoRenderProviderStorage.seashellArmorRenderProvider = createBasicRenderProvider(::SeashellArmorRenderer) +// GeoRenderProviderStorage.manglerfishArmorRenderProvider = createBasicRenderProvider(::ManglerfishArmorRenderer) +// GeoRenderProviderStorage.turtleArmorRenderProvider = createBasicRenderProvider(::TurtleArmorRenderer) +// GeoRenderProviderStorage.eelArmorRenderProvider = createBasicRenderProvider(::EelArmorRenderer) +// GeoRenderProviderStorage.moonjellyfishArmorRenderProvider = createBasicRenderProvider(::MoonJellyfishArmorRenderer) } private fun createBasicRenderProvider(rendererProvider: () -> GeoArmorRenderer<*>): () -> RenderProvider { diff --git a/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/DivingArmorRenderer.kt b/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/DivingArmorRenderer.kt index 3a9cd6d65..bde6373d1 100644 --- a/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/DivingArmorRenderer.kt +++ b/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/DivingArmorRenderer.kt @@ -1,11 +1,11 @@ -package dev.hybridlabs.aquatic.client.render.armor - -import dev.hybridlabs.aquatic.HybridAquatic -import dev.hybridlabs.aquatic.item.DivingArmorItem -import net.minecraft.util.Identifier -import software.bernie.geckolib.model.DefaultedItemGeoModel -import software.bernie.geckolib.renderer.GeoArmorRenderer - -class DivingArmorRenderer : GeoArmorRenderer( - DefaultedItemGeoModel(Identifier(HybridAquatic.MOD_ID, "armor/diving_armor")) -) \ No newline at end of file +//package dev.hybridlabs.aquatic.client.render.armor +// +//import dev.hybridlabs.aquatic.HybridAquatic +//import dev.hybridlabs.aquatic.item.DivingArmorItem +//import net.minecraft.util.Identifier +//import software.bernie.geckolib.model.DefaultedItemGeoModel +//import software.bernie.geckolib.renderer.GeoArmorRenderer +// +//class DivingArmorRenderer : GeoArmorRenderer( +// DefaultedItemGeoModel(Identifier(HybridAquatic.MOD_ID, "armor/diving_armor")) +//) \ No newline at end of file diff --git a/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/ManglerfishArmorRenderer.kt b/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/ManglerfishArmorRenderer.kt index 01fa52fd6..01d433cf8 100644 --- a/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/ManglerfishArmorRenderer.kt +++ b/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/ManglerfishArmorRenderer.kt @@ -1,11 +1,11 @@ -package dev.hybridlabs.aquatic.client.render.armor - -import dev.hybridlabs.aquatic.HybridAquatic -import dev.hybridlabs.aquatic.item.DivingArmorItem -import net.minecraft.util.Identifier -import software.bernie.geckolib.model.DefaultedItemGeoModel -import software.bernie.geckolib.renderer.GeoArmorRenderer - -class ManglerfishArmorRenderer : GeoArmorRenderer( - DefaultedItemGeoModel(Identifier(HybridAquatic.MOD_ID, "armor/manglerfish_armor")) -) \ No newline at end of file +//package dev.hybridlabs.aquatic.client.render.armor +// +//import dev.hybridlabs.aquatic.HybridAquatic +//import dev.hybridlabs.aquatic.item.DivingArmorItem +//import net.minecraft.util.Identifier +//import software.bernie.geckolib.model.DefaultedItemGeoModel +//import software.bernie.geckolib.renderer.GeoArmorRenderer +// +//class ManglerfishArmorRenderer : GeoArmorRenderer( +// DefaultedItemGeoModel(Identifier(HybridAquatic.MOD_ID, "armor/manglerfish_armor")) +//) \ No newline at end of file diff --git a/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/SeashellArmorRenderer.kt b/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/SeashellArmorRenderer.kt index d3c1cefca..733c76a14 100644 --- a/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/SeashellArmorRenderer.kt +++ b/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/SeashellArmorRenderer.kt @@ -1,11 +1,11 @@ -package dev.hybridlabs.aquatic.client.render.armor - -import dev.hybridlabs.aquatic.HybridAquatic -import dev.hybridlabs.aquatic.item.DivingArmorItem -import net.minecraft.util.Identifier -import software.bernie.geckolib.model.DefaultedItemGeoModel -import software.bernie.geckolib.renderer.GeoArmorRenderer - -class SeashellArmorRenderer : GeoArmorRenderer( - DefaultedItemGeoModel(Identifier(HybridAquatic.MOD_ID, "armor/seashell_armor")) -) \ No newline at end of file +//package dev.hybridlabs.aquatic.client.render.armor +// +//import dev.hybridlabs.aquatic.HybridAquatic +//import dev.hybridlabs.aquatic.item.DivingArmorItem +//import net.minecraft.util.Identifier +//import software.bernie.geckolib.model.DefaultedItemGeoModel +//import software.bernie.geckolib.renderer.GeoArmorRenderer +// +//class SeashellArmorRenderer : GeoArmorRenderer( +// DefaultedItemGeoModel(Identifier(HybridAquatic.MOD_ID, "armor/seashell_armor")) +//) \ No newline at end of file diff --git a/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/TurtleArmorRenderer.kt b/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/TurtleArmorRenderer.kt index 16eae00e8..1612b335e 100644 --- a/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/TurtleArmorRenderer.kt +++ b/src/client/kotlin/dev/hybridlabs/aquatic/client/render/armor/TurtleArmorRenderer.kt @@ -1,11 +1,11 @@ -package dev.hybridlabs.aquatic.client.render.armor - -import dev.hybridlabs.aquatic.HybridAquatic -import dev.hybridlabs.aquatic.item.DivingArmorItem -import net.minecraft.util.Identifier -import software.bernie.geckolib.model.DefaultedItemGeoModel -import software.bernie.geckolib.renderer.GeoArmorRenderer - -class TurtleArmorRenderer : GeoArmorRenderer( - DefaultedItemGeoModel(Identifier(HybridAquatic.MOD_ID, "armor/turtle_armor")) -) \ No newline at end of file +//package dev.hybridlabs.aquatic.client.render.armor +// +//import dev.hybridlabs.aquatic.HybridAquatic +//import dev.hybridlabs.aquatic.item.DivingArmorItem +//import net.minecraft.util.Identifier +//import software.bernie.geckolib.model.DefaultedItemGeoModel +//import software.bernie.geckolib.renderer.GeoArmorRenderer +// +//class TurtleArmorRenderer : GeoArmorRenderer( +// DefaultedItemGeoModel(Identifier(HybridAquatic.MOD_ID, "armor/turtle_armor")) +//) \ No newline at end of file diff --git a/src/main/java/dev/hybridlabs/aquatic/mixin/LivingEntityMixin.java b/src/main/java/dev/hybridlabs/aquatic/mixin/LivingEntityMixin.java index dfb993d4e..157647b74 100644 --- a/src/main/java/dev/hybridlabs/aquatic/mixin/LivingEntityMixin.java +++ b/src/main/java/dev/hybridlabs/aquatic/mixin/LivingEntityMixin.java @@ -21,16 +21,16 @@ public abstract class LivingEntityMixin { @Unique private int brineEffectTick = 0; - + @Inject( - method = "baseTick", - at = @At( - value = "TAIL" - ) + method = "baseTick", + at = @At( + value = "TAIL" + ) ) private void applyToxicShockInBrine(CallbackInfo ci) { LivingEntity livingEntity = (LivingEntity) (Object) this; - + if (!livingEntity.getWorld().isClient && brineEffectTick >= 20) { brineEffectTick = 0; Box box = livingEntity.getBoundingBox().contract(0.001); @@ -41,41 +41,41 @@ private void applyToxicShockInBrine(CallbackInfo ci) { int entityMinZ = MathHelper.floor(box.minZ); int entityMaxZ = MathHelper.ceil(box.maxZ); BlockPos.Mutable mutable = new BlockPos.Mutable(); - + for(int entityX = entityMinX; entityX < entityMaxX; ++entityX) { for(int entityY = entityMinY; entityY < entityMaxY; ++entityY) { for (int entityZ = entityMinZ; entityZ < entityMaxZ; ++entityZ) { mutable.set(entityX, entityY, entityZ); FluidState fluidState = livingEntity.getWorld().getFluidState(mutable); - - if(fluidState.isIn(HybridAquaticFluidTags.INSTANCE.getBRINE())) tickBrine(); + +// if(fluidState.isIn(HybridAquaticFluidTags.INSTANCE.getBRINE())) tickBrine(); } } } - + } - + brineEffectTick++; } - - @Unique - private void tickBrine() { - LivingEntity livingEntity = (LivingEntity) (Object) this; - - if (!isWearingDivingSet(livingEntity)) livingEntity.addStatusEffect(new StatusEffectInstance(HybridAquaticStatusEffects.INSTANCE.getTOXIC_SHOCK(), 100, 0)); - livingEntity.addStatusEffect(new StatusEffectInstance(HybridAquaticStatusEffects.INSTANCE.getCORROSION(), 100, 0)); - } - - @Unique - private boolean isWearingDivingSet(LivingEntity entity) { - var helmet = entity.getEquippedStack(EquipmentSlot.HEAD); - var chestplate = entity.getEquippedStack(EquipmentSlot.CHEST); - var leggings = entity.getEquippedStack(EquipmentSlot.LEGS); - var boots = entity.getEquippedStack(EquipmentSlot.FEET); - return helmet.isOf(HybridAquaticItems.INSTANCE.getDIVING_HELMET()) && - chestplate.isOf(HybridAquaticItems.INSTANCE.getDIVING_SUIT()) && - leggings.isOf(HybridAquaticItems.INSTANCE.getDIVING_LEGGINGS()) && - boots.isOf(HybridAquaticItems.INSTANCE.getDIVING_BOOTS()); - } +// @Unique +// private void tickBrine() { +// LivingEntity livingEntity = (LivingEntity) (Object) this; +// +// if (!isWearingDivingSet(livingEntity)) livingEntity.addStatusEffect(new StatusEffectInstance(HybridAquaticStatusEffects.INSTANCE.getTOXIC_SHOCK(), 100, 0)); +// livingEntity.addStatusEffect(new StatusEffectInstance(HybridAquaticStatusEffects.INSTANCE.getCORROSION(), 100, 0)); +// } +// +// @Unique +// private boolean isWearingDivingSet(LivingEntity entity) { +// var helmet = entity.getEquippedStack(EquipmentSlot.HEAD); +// var chestplate = entity.getEquippedStack(EquipmentSlot.CHEST); +// var leggings = entity.getEquippedStack(EquipmentSlot.LEGS); +// var boots = entity.getEquippedStack(EquipmentSlot.FEET); +// +// return helmet.isOf(HybridAquaticItems.INSTANCE.getDIVING_HELMET()) && +// chestplate.isOf(HybridAquaticItems.INSTANCE.getDIVING_SUIT()) && +// leggings.isOf(HybridAquaticItems.INSTANCE.getDIVING_LEGGINGS()) && +// boots.isOf(HybridAquaticItems.INSTANCE.getDIVING_BOOTS()); +// } } \ No newline at end of file diff --git a/src/main/java/dev/hybridlabs/aquatic/mixin/PlayerEntityMixin.java b/src/main/java/dev/hybridlabs/aquatic/mixin/PlayerEntityMixin.java index d9fbfd0e1..7db26c260 100644 --- a/src/main/java/dev/hybridlabs/aquatic/mixin/PlayerEntityMixin.java +++ b/src/main/java/dev/hybridlabs/aquatic/mixin/PlayerEntityMixin.java @@ -88,7 +88,7 @@ private void setCustomHurtTimeOnDamage(DamageSource source, float amount, Callba if (foundEntity != null) hybrid_aquatic$setHurtTime(200); } } - + @Inject(method = "tick", at = @At("TAIL")) private void tickDownCustomHurtTime(CallbackInfo ci) { int cHurtTime = hybrid_aquatic$getHurtTime(); @@ -110,58 +110,58 @@ private void updateDivingHelmet() { var player = (PlayerEntity)(Object)this; ItemStack itemStack = player.getEquippedStack(EquipmentSlot.HEAD); - if (itemStack.isOf(HybridAquaticItems.INSTANCE.getDIVING_HELMET())) { - if (!player.isSubmergedIn(FluidTags.WATER)) { - player.addStatusEffect(new StatusEffectInstance(StatusEffects.WATER_BREATHING, 600, 0, false, false, false)); - } else { - player.addStatusEffect(new StatusEffectInstance(HybridAquaticStatusEffects.INSTANCE.getCLARITY(), 600, 0, false, false, false)); - } - } +// if (itemStack.isOf(HybridAquaticItems.INSTANCE.getDIVING_HELMET())) { +// if (!player.isSubmergedIn(FluidTags.WATER)) { +// player.addStatusEffect(new StatusEffectInstance(StatusEffects.WATER_BREATHING, 600, 0, false, false, false)); +// } else { +// player.addStatusEffect(new StatusEffectInstance(HybridAquaticStatusEffects.INSTANCE.getCLARITY(), 600, 0, false, false, false)); +// } +// } } @Unique private void updateDivingBoots() { var player = (PlayerEntity)(Object)this; ItemStack itemStack = player.getEquippedStack(EquipmentSlot.FEET); - isWearingDivingBoots = itemStack.isOf(HybridAquaticItems.INSTANCE.getDIVING_BOOTS()); - if (isWearingDivingBoots && player.isSubmergedIn(FluidTags.WATER)) { - player.setStepHeight(1.0f); - } else { - player.setStepHeight(0.6f); - } +// isWearingDivingBoots = itemStack.isOf(HybridAquaticItems.INSTANCE.getDIVING_BOOTS()); +// if (isWearingDivingBoots && player.isSubmergedIn(FluidTags.WATER)) { +// player.setStepHeight(1.0f); +// } else { +// player.setStepHeight(0.6f); +// } } @Unique private void updateTurtleChestplate() { var player = (PlayerEntity)(Object)this; var itemStack = player.getEquippedStack(EquipmentSlot.CHEST); - if (itemStack.isOf(HybridAquaticItems.INSTANCE.getTURTLE_CHESTPLATE())) { - player.addStatusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 200, 0, false, false, true)); - player.addStatusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 200, 0, false, false, true)); - } +// if (itemStack.isOf(HybridAquaticItems.INSTANCE.getTURTLE_CHESTPLATE())) { +// player.addStatusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 200, 0, false, false, true)); +// player.addStatusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 200, 0, false, false, true)); +// } } - + @Unique int coralRepairTick = 0; @Unique private void repairCoralTools(int tickDelay) { var player = (PlayerEntity)(Object)this; var inventory = player.getInventory(); - + if (player.isSubmergedIn(FluidTags.WATER)) { if (coralRepairTick > tickDelay) { List> combinedInventory = ImmutableList.of(inventory.main, inventory.offHand); List coralItems = new ArrayList<>(); for(List list: combinedInventory) { - for (ItemStack itemStack: list) { - if (itemStack.getItem() instanceof ToolItem tool && - tool.getMaterial() == HybridAquaticToolMaterials.CORAL && - itemStack.isDamaged()) { - coralItems.add(itemStack); - } - } + for (ItemStack itemStack: list) { + if (itemStack.getItem() instanceof ToolItem tool && + tool.getMaterial() == HybridAquaticToolMaterials.CORAL && + itemStack.isDamaged()) { + coralItems.add(itemStack); + } + } } - + if(!coralItems.isEmpty()) { ItemStack item = coralItems.get(player.getRandom().nextInt(coralItems.size())); item.setDamage(item.getDamage() - 1); @@ -169,7 +169,7 @@ private void repairCoralTools(int tickDelay) { } coralRepairTick = 0; } - + coralRepairTick++; } } diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt index 66c945f73..e519cd851 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt @@ -266,7 +266,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output HybridAquaticItems.CREEPERMAGNET_HOOK to "CreeperMagnet Hook", HybridAquaticItems.OMINOUS_HOOK to "Ominous Hook", HybridAquaticItems.FISHING_NET to "Fishing Net", - HybridAquaticItems.KARKINOS_CLAW to "Karkinos Claw", + //HybridAquaticItems.KARKINOS_CLAW to "Karkinos Claw", HybridAquaticItems.SEASHELL_SPEAR to "Seashell Spear", HybridAquaticItems.SEASHELL_PICKAXE to "Seashell Pickaxe", HybridAquaticItems.SEASHELL_AXE to "Seashell Axe", @@ -277,17 +277,17 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output HybridAquaticItems.CORAL_AXE to "Coral Axe", HybridAquaticItems.CORAL_SHOVEL to "Coral Shovel", HybridAquaticItems.CORAL_HOE to "Coral Hoe", - HybridAquaticItems.DIVING_HELMET to "Diving Helmet", - HybridAquaticItems.DIVING_SUIT to "Diving Suit", - HybridAquaticItems.DIVING_LEGGINGS to "Diving Leggings", - HybridAquaticItems.DIVING_BOOTS to "Diving Boots", - HybridAquaticItems.NAUTILUS_HELMET to "Nautilus Helmet", - HybridAquaticItems.NAUTILUS_PAULDRONS to "Nautilus Pauldrons", - HybridAquaticItems.MANGLERFISH_LURE to "Manglerfish Lure", - HybridAquaticItems.MANGLERFISH_FIN to "Manglerfish Fin", - HybridAquaticItems.EEL_SCARF to "Eel Scarf", - HybridAquaticItems.TURTLE_CHESTPLATE to "Turtle Chestplate", - HybridAquaticItems.MOON_JELLYFISH_HAT to "Moon Jellyfish Hat", +// HybridAquaticItems.DIVING_HELMET to "Diving Helmet", +// HybridAquaticItems.DIVING_SUIT to "Diving Suit", +// HybridAquaticItems.DIVING_LEGGINGS to "Diving Leggings", +// HybridAquaticItems.DIVING_BOOTS to "Diving Boots", +// HybridAquaticItems.NAUTILUS_HELMET to "Nautilus Helmet", +// HybridAquaticItems.NAUTILUS_PAULDRONS to "Nautilus Pauldrons", +// HybridAquaticItems.MANGLERFISH_LURE to "Manglerfish Lure", +// HybridAquaticItems.MANGLERFISH_FIN to "Manglerfish Fin", +// HybridAquaticItems.EEL_SCARF to "Eel Scarf", +// HybridAquaticItems.TURTLE_CHESTPLATE to "Turtle Chestplate", +// HybridAquaticItems.MOON_JELLYFISH_HAT to "Moon Jellyfish Hat", ).forEach { (item, translation) -> builder.add(item, translation) } @@ -326,7 +326,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output HybridAquaticBlocks.ACACIA_CRATE.translationKey to "Break with an axe to open", HybridAquaticBlocks.CHERRY_CRATE.translationKey to "Break with an axe to open", HybridAquaticItems.FISHING_NET.translationKey to "Stored Entity: %s", - HybridAquaticItems.MOON_JELLYFISH_HAT.translationKey to "Made by Jakotens", +// HybridAquaticItems.MOON_JELLYFISH_HAT.translationKey to "Made by Jakotens", ).forEach { (itemTranslationKey, translation) -> builder.add(itemTranslationKey.plus(".description"), translation) } diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt index 47c66ae85..6b7871239 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt @@ -274,17 +274,17 @@ class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) { HybridAquaticItems.MAGNETIC_HOOK, HybridAquaticItems.CREEPERMAGNET_HOOK, HybridAquaticItems.OMINOUS_HOOK, - HybridAquaticItems.DIVING_HELMET, - HybridAquaticItems.DIVING_SUIT, - HybridAquaticItems.DIVING_LEGGINGS, - HybridAquaticItems.DIVING_BOOTS, - HybridAquaticItems.NAUTILUS_HELMET, - HybridAquaticItems.NAUTILUS_PAULDRONS, - HybridAquaticItems.MANGLERFISH_LURE, - HybridAquaticItems.MANGLERFISH_FIN, - HybridAquaticItems.TURTLE_CHESTPLATE, - HybridAquaticItems.EEL_SCARF, - HybridAquaticItems.MOON_JELLYFISH_HAT +// HybridAquaticItems.DIVING_HELMET, +// HybridAquaticItems.DIVING_SUIT, +// HybridAquaticItems.DIVING_LEGGINGS, +// HybridAquaticItems.DIVING_BOOTS, +// HybridAquaticItems.NAUTILUS_HELMET, +// HybridAquaticItems.NAUTILUS_PAULDRONS, +// HybridAquaticItems.MANGLERFISH_LURE, +// HybridAquaticItems.MANGLERFISH_FIN, +// HybridAquaticItems.TURTLE_CHESTPLATE, +// HybridAquaticItems.EEL_SCARF, +// HybridAquaticItems.MOON_JELLYFISH_HAT ).forEach { item -> generator.register(item, Models.GENERATED) } diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/AdvancementProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/AdvancementProvider.kt index b9917714c..4d77acce3 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/AdvancementProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/AdvancementProvider.kt @@ -119,86 +119,86 @@ class AdvancementProvider(output: FabricDataOutput) : FabricAdvancementProvider( .build(Identifier("hybrid-aquatic", "buoy")) consumer?.accept(buoyAdvancement) - val divingSuitAdvancement = Advancement.Builder.create() - .parent(boatAdvancement) - .display( - HybridAquaticItems.DIVING_HELMET, - Text.translatable("advancements.hybrid-aquatic.diving_suit.title"), - Text.translatable("advancements.hybrid-aquatic.diving_suit.description"), - Identifier("textures/gui/advancements/backgrounds/adventure.png"), - AdvancementFrame.GOAL, - true, - true, - false - ) - .criterion( - "obtain_diving_suit", - InventoryChangedCriterion.Conditions.items( - HybridAquaticItems.DIVING_HELMET, - HybridAquaticItems.DIVING_SUIT, - HybridAquaticItems.DIVING_LEGGINGS, - HybridAquaticItems.DIVING_BOOTS - ) - ) - .build(Identifier("hybrid-aquatic", "diving_suit")) - consumer?.accept(divingSuitAdvancement) +// val divingSuitAdvancement = Advancement.Builder.create() +// .parent(boatAdvancement) +// .display( +// HybridAquaticItems.DIVING_HELMET, +// Text.translatable("advancements.hybrid-aquatic.diving_suit.title"), +// Text.translatable("advancements.hybrid-aquatic.diving_suit.description"), +// Identifier("textures/gui/advancements/backgrounds/adventure.png"), +// AdvancementFrame.GOAL, +// true, +// true, +// false +// ) +// .criterion( +// "obtain_diving_suit", +// InventoryChangedCriterion.Conditions.items( +// HybridAquaticItems.DIVING_HELMET, +// HybridAquaticItems.DIVING_SUIT, +// HybridAquaticItems.DIVING_LEGGINGS, +// HybridAquaticItems.DIVING_BOOTS +// ) +// ) +// .build(Identifier("hybrid-aquatic", "diving_suit")) +// consumer?.accept(divingSuitAdvancement) - val brineAdvancement = Advancement.Builder.create() - .parent(divingSuitAdvancement) - .display( - HybridAquaticItems.BRINE_BUCKET, - Text.translatable("advancements.hybrid-aquatic.brine.title"), - Text.translatable("advancements.hybrid-aquatic.brine.description"), - Identifier("textures/gui/advancements/backgrounds/adventure.png"), - AdvancementFrame.TASK, - true, - true, - false - ) - .criterion( - "enter_brine", - EnterBlockCriterion.Conditions.block(BRINE) - ) - .build(Identifier("hybrid-aquatic", "brine")) - consumer?.accept(brineAdvancement) +// val brineAdvancement = Advancement.Builder.create() +// .parent(divingSuitAdvancement) +// .display( +// HybridAquaticItems.BRINE_BUCKET, +// Text.translatable("advancements.hybrid-aquatic.brine.title"), +// Text.translatable("advancements.hybrid-aquatic.brine.description"), +// Identifier("textures/gui/advancements/backgrounds/adventure.png"), +// AdvancementFrame.TASK, +// true, +// true, +// false +// ) +// .criterion( +// "enter_brine", +// EnterBlockCriterion.Conditions.block(BRINE) +// ) +// .build(Identifier("hybrid-aquatic", "brine")) +// consumer?.accept(brineAdvancement) - val obtainPearlAdvancement = Advancement.Builder.create() - .parent(divingSuitAdvancement) - .display( - HybridAquaticItems.PEARL, - Text.translatable("advancements.hybrid-aquatic.pearl.title"), - Text.translatable("advancements.hybrid-aquatic.pearl.description"), - Identifier("textures/gui/advancements/backgrounds/adventure.png"), - AdvancementFrame.TASK, - true, - true, - false - ) - .criterion( - "obtain_pearl", - InventoryChangedCriterion.Conditions.items(HybridAquaticItems.PEARL) - ) - .build(Identifier("hybrid-aquatic", "pearl")) - consumer?.accept(obtainPearlAdvancement) +// val obtainPearlAdvancement = Advancement.Builder.create() +// .parent(divingSuitAdvancement) +// .display( +// HybridAquaticItems.PEARL, +// Text.translatable("advancements.hybrid-aquatic.pearl.title"), +// Text.translatable("advancements.hybrid-aquatic.pearl.description"), +// Identifier("textures/gui/advancements/backgrounds/adventure.png"), +// AdvancementFrame.TASK, +// true, +// true, +// false +// ) +// .criterion( +// "obtain_pearl", +// InventoryChangedCriterion.Conditions.items(HybridAquaticItems.PEARL) +// ) +// .build(Identifier("hybrid-aquatic", "pearl")) +// consumer?.accept(obtainPearlAdvancement) - val obtainBlackPearlAdvancement = Advancement.Builder.create() - .parent(obtainPearlAdvancement) - .display( - HybridAquaticItems.BLACK_PEARL, - Text.translatable("advancements.hybrid-aquatic.black_pearl.title"), - Text.translatable("advancements.hybrid-aquatic.black_pearl.description"), - Identifier("textures/gui/advancements/backgrounds/adventure.png"), - AdvancementFrame.TASK, - true, - true, - true - ) - .criterion( - "obtain_black_pearl", - InventoryChangedCriterion.Conditions.items(HybridAquaticItems.BLACK_PEARL) - ) - .build(Identifier("hybrid-aquatic", "black_pearl")) - consumer?.accept(obtainBlackPearlAdvancement) +// val obtainBlackPearlAdvancement = Advancement.Builder.create() +// .parent(obtainPearlAdvancement) +// .display( +// HybridAquaticItems.BLACK_PEARL, +// Text.translatable("advancements.hybrid-aquatic.black_pearl.title"), +// Text.translatable("advancements.hybrid-aquatic.black_pearl.description"), +// Identifier("textures/gui/advancements/backgrounds/adventure.png"), +// AdvancementFrame.TASK, +// true, +// true, +// true +// ) +// .criterion( +// "obtain_black_pearl", +// InventoryChangedCriterion.Conditions.items(HybridAquaticItems.BLACK_PEARL) +// ) +// .build(Identifier("hybrid-aquatic", "black_pearl")) +// consumer?.accept(obtainBlackPearlAdvancement) val fishingHookAdvancement = Advancement.Builder.create() .parent(fishingNetAdvancement) @@ -280,26 +280,26 @@ class AdvancementProvider(output: FabricDataOutput) : FabricAdvancementProvider( .build(Identifier("hybrid-aquatic", "ominous_hook")) consumer?.accept(ominousHookAdvancement) - val killKarkinosAdvancement = Advancement.Builder.create() - .parent(ominousHookAdvancement) - .display( - HybridAquaticItems.KARKINOS_CLAW, - Text.translatable("advancements.hybrid-aquatic.kill_karkinos.title"), - Text.translatable("advancements.hybrid-aquatic.kill_karkinos.description"), - Identifier("textures/gui/advancements/backgrounds/adventure.png"), - AdvancementFrame.CHALLENGE, - true, - true, - true - ) - .criterion( - "kill_karkinos", - OnKilledCriterion.Conditions.createPlayerKilledEntity( - EntityPredicate.Builder.create().type(HybridAquaticEntityTypes.KARKINOS).build() - ) - ) - .build(Identifier("hybrid-aquatic", "kill_karkinos")) - consumer?.accept(killKarkinosAdvancement) +// val killKarkinosAdvancement = Advancement.Builder.create() +// .parent(ominousHookAdvancement) +// .display( +// //HybridAquaticItems.KARKINOS_CLAW, +// Text.translatable("advancements.hybrid-aquatic.kill_karkinos.title"), +// Text.translatable("advancements.hybrid-aquatic.kill_karkinos.description"), +// Identifier("textures/gui/advancements/backgrounds/adventure.png"), +// AdvancementFrame.CHALLENGE, +// true, +// true, +// true +// ) +// .criterion( +// "kill_karkinos", +// OnKilledCriterion.Conditions.createPlayerKilledEntity( +// EntityPredicate.Builder.create().type(HybridAquaticEntityTypes.KARKINOS).build() +// ) +// ) +// .build(Identifier("hybrid-aquatic", "kill_karkinos")) +// consumer?.accept(killKarkinosAdvancement) val killSharkAdvancement = Advancement.Builder.create() .parent(boatAdvancement) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/RecipeProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/RecipeProvider.kt index 038f644ad..b2f99b364 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/RecipeProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/RecipeProvider.kt @@ -130,21 +130,21 @@ class RecipeProvider(output: FabricDataOutput) : FabricRecipeProvider(output) { .criterion("has_shell", InventoryChangedCriterion.Conditions.items(Items.NAUTILUS_SHELL)) .offerTo(exporter) - ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, HybridAquaticItems.NAUTILUS_HELMET,1) - .pattern("NNN") - .pattern("N N") - .pattern(" ") - .input('N', Items.NAUTILUS_SHELL) - .criterion("has_shell", InventoryChangedCriterion.Conditions.items(Items.NAUTILUS_SHELL)) - .offerTo(exporter) - - ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, HybridAquaticItems.NAUTILUS_PAULDRONS,1) - .pattern("N N") - .pattern("N N") - .pattern(" ") - .input('N', Items.NAUTILUS_SHELL) - .criterion("has_shell", InventoryChangedCriterion.Conditions.items(Items.NAUTILUS_SHELL)) - .offerTo(exporter) +// ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, HybridAquaticItems.NAUTILUS_HELMET,1) +// .pattern("NNN") +// .pattern("N N") +// .pattern(" ") +// .input('N', Items.NAUTILUS_SHELL) +// .criterion("has_shell", InventoryChangedCriterion.Conditions.items(Items.NAUTILUS_SHELL)) +// .offerTo(exporter) + +// ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, HybridAquaticItems.NAUTILUS_PAULDRONS,1) +// .pattern("N N") +// .pattern("N N") +// .pattern(" ") +// .input('N', Items.NAUTILUS_SHELL) +// .criterion("has_shell", InventoryChangedCriterion.Conditions.items(Items.NAUTILUS_SHELL)) +// .offerTo(exporter) offerSlabRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, HybridAquaticBlocks.DRIFTWOOD_SLAB, HybridAquaticBlocks.DRIFTWOOD_PLANKS) offerBarkBlockRecipe(exporter, HybridAquaticBlocks.DRIFTWOOD_WOOD, HybridAquaticBlocks.DRIFTWOOD_LOG) @@ -157,53 +157,53 @@ class RecipeProvider(output: FabricDataOutput) : FabricRecipeProvider(output) { .offerTo(exporter) // armor recipes - ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, HybridAquaticItems.TURTLE_CHESTPLATE) - .pattern("S S") - .pattern("SSS") - .pattern("SSS") - .input('S', Items.SCUTE) - .criterion("has_scute", InventoryChangedCriterion.Conditions.items(Items.SCUTE)) - .offerTo(exporter) - - ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, HybridAquaticItems.DIVING_HELMET) - .pattern("CCC") - .pattern("CGC") - .pattern("CCC") - .input('C', Items.COPPER_INGOT) - .input('G', Items.GLASS_PANE) - .criterion("has_copper", InventoryChangedCriterion.Conditions.items(Items.COPPER_INGOT)) - .criterion("has_glass_pane", InventoryChangedCriterion.Conditions.items(Items.GLASS_PANE)) - .criterion("has_glass", InventoryChangedCriterion.Conditions.items(Items.GLASS)) - .offerTo(exporter) - - ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, HybridAquaticItems.DIVING_SUIT) - .pattern("C C") - .pattern("LCL") - .pattern("LLL") - .input('L', Items.LEATHER) - .input('C', Items.COPPER_INGOT) - .criterion("has_leather", InventoryChangedCriterion.Conditions.items(Items.LEATHER)) - .criterion("has_copper", InventoryChangedCriterion.Conditions.items(Items.COPPER_INGOT)) - .offerTo(exporter) - - ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, HybridAquaticItems.DIVING_LEGGINGS) - .pattern("CCC") - .pattern("L L") - .pattern("L L") - .input('L', Items.LEATHER) - .input('C', Items.COPPER_INGOT) - .criterion("has_leather", InventoryChangedCriterion.Conditions.items(Items.LEATHER)) - .criterion("has_copper", InventoryChangedCriterion.Conditions.items(Items.COPPER_INGOT)) - .offerTo(exporter) - - ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, HybridAquaticItems.DIVING_BOOTS) - .pattern("C C") - .pattern("C C") - .pattern(" ") - .input('C', Items.COPPER_INGOT) - .criterion("has_leather", InventoryChangedCriterion.Conditions.items(Items.LEATHER)) - .criterion("has_copper", InventoryChangedCriterion.Conditions.items(Items.COPPER_INGOT)) - .offerTo(exporter) +// ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, HybridAquaticItems.TURTLE_CHESTPLATE) +// .pattern("S S") +// .pattern("SSS") +// .pattern("SSS") +// .input('S', Items.SCUTE) +// .criterion("has_scute", InventoryChangedCriterion.Conditions.items(Items.SCUTE)) +// .offerTo(exporter) +// +// ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, HybridAquaticItems.DIVING_HELMET) +// .pattern("CCC") +// .pattern("CGC") +// .pattern("CCC") +// .input('C', Items.COPPER_INGOT) +// .input('G', Items.GLASS_PANE) +// .criterion("has_copper", InventoryChangedCriterion.Conditions.items(Items.COPPER_INGOT)) +// .criterion("has_glass_pane", InventoryChangedCriterion.Conditions.items(Items.GLASS_PANE)) +// .criterion("has_glass", InventoryChangedCriterion.Conditions.items(Items.GLASS)) +// .offerTo(exporter) +// +// ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, HybridAquaticItems.DIVING_SUIT) +// .pattern("C C") +// .pattern("LCL") +// .pattern("LLL") +// .input('L', Items.LEATHER) +// .input('C', Items.COPPER_INGOT) +// .criterion("has_leather", InventoryChangedCriterion.Conditions.items(Items.LEATHER)) +// .criterion("has_copper", InventoryChangedCriterion.Conditions.items(Items.COPPER_INGOT)) +// .offerTo(exporter) +// +// ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, HybridAquaticItems.DIVING_LEGGINGS) +// .pattern("CCC") +// .pattern("L L") +// .pattern("L L") +// .input('L', Items.LEATHER) +// .input('C', Items.COPPER_INGOT) +// .criterion("has_leather", InventoryChangedCriterion.Conditions.items(Items.LEATHER)) +// .criterion("has_copper", InventoryChangedCriterion.Conditions.items(Items.COPPER_INGOT)) +// .offerTo(exporter) +// +// ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, HybridAquaticItems.DIVING_BOOTS) +// .pattern("C C") +// .pattern("C C") +// .pattern(" ") +// .input('C', Items.COPPER_INGOT) +// .criterion("has_leather", InventoryChangedCriterion.Conditions.items(Items.LEATHER)) +// .criterion("has_copper", InventoryChangedCriterion.Conditions.items(Items.COPPER_INGOT)) +// .offerTo(exporter) //#region hooks ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, HybridAquaticItems.BARBED_HOOK) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/EntityTypeLootTableProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/EntityTypeLootTableProvider.kt index e6ca9a7e7..744ad1a99 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/EntityTypeLootTableProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/EntityTypeLootTableProvider.kt @@ -46,36 +46,36 @@ class EntityTypeLootTableProvider(output: FabricDataOutput) : SimpleFabricLootTa } //crustaceans - export(exporter, HybridAquaticEntityTypes.KARKINOS) { - pool( - LootPool.builder() - .with( - ItemEntry.builder(HybridAquaticItems.RAW_CRAB) - .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(8.0F, 16.0F))) - ) - ) - pool( - LootPool.builder() - .with( - ItemEntry.builder(HybridAquaticItems.KARKINOS_CLAW) - ) - ) - } - - export(exporter, HybridAquaticEntityTypes.MANGLERFISH) { - pool( - LootPool.builder() - .with( - ItemEntry.builder(HybridAquaticItems.MANGLERFISH_LURE) - ) - ) - pool( - LootPool.builder() - .with( - ItemEntry.builder(HybridAquaticItems.MANGLERFISH_FIN) - ) - ) - } +// export(exporter, HybridAquaticEntityTypes.KARKINOS) { +// pool( +// LootPool.builder() +// .with( +// ItemEntry.builder(HybridAquaticItems.RAW_CRAB) +// .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(8.0F, 16.0F))) +// ) +// ) +// pool( +// LootPool.builder() +// .with( +// ItemEntry.builder(HybridAquaticItems.KARKINOS_CLAW) +// ) +// ) +// } + +// export(exporter, HybridAquaticEntityTypes.MANGLERFISH) { +// pool( +// LootPool.builder() +// .with( +// ItemEntry.builder(HybridAquaticItems.MANGLERFISH_LURE) +// ) +// ) +// pool( +// LootPool.builder() +// .with( +// ItemEntry.builder(HybridAquaticItems.MANGLERFISH_FIN) +// ) +// ) +// } export(exporter, HybridAquaticEntityTypes.DECORATOR_CRAB) { pool( diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/GenericLootTableProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/GenericLootTableProvider.kt index 703dd1645..030c0c6ca 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/GenericLootTableProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/GenericLootTableProvider.kt @@ -84,8 +84,8 @@ class GenericLootTableProvider(output: FabricDataOutput) : LootPool.builder() .rolls(ConstantLootNumberProvider.create(1.0f)) .bonusRolls(UniformLootNumberProvider.create(0.0f, 1.0f)) - .with(ItemEntry.builder(HybridAquaticItems.EEL_SCARF)) - .with(ItemEntry.builder(HybridAquaticItems.MOON_JELLYFISH_HAT)) +// .with(ItemEntry.builder(HybridAquaticItems.EEL_SCARF)) +// .with(ItemEntry.builder(HybridAquaticItems.MOON_JELLYFISH_HAT)) .with(ItemEntry.builder(HybridAquaticItems.GREAT_WHITE_SHARK_PLUSHIE)) .with(ItemEntry.builder(HybridAquaticItems.WHALE_SHARK_PLUSHIE)) .with(ItemEntry.builder(HybridAquaticItems.TIGER_SHARK_PLUSHIE)) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt index 36c712bd7..857bd5686 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt @@ -320,38 +320,38 @@ class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFut getOrCreateTagBuilder(HybridAquaticItemTags.PLUSHIES).add(item) } - setOf( - HybridAquaticItems.MOON_JELLYFISH_HAT, - HybridAquaticItems.MANGLERFISH_LURE, - ).forEach { item -> - getOrCreateTagBuilder(HybridAquaticItemTags.HAT).add(item) - } - - setOf( - HybridAquaticItems.EEL_SCARF, - ).forEach { item -> - getOrCreateTagBuilder(HybridAquaticItemTags.SCARF).add(item) - } - - setOf( - HybridAquaticItems.MANGLERFISH_FIN, - ).forEach { item -> - getOrCreateTagBuilder(HybridAquaticItemTags.BACK_FIN).add(item) - } - - setOf( - HybridAquaticItems.MANGLERFISH_LURE, - HybridAquaticItems.MANGLERFISH_FIN, - HybridAquaticItems.EEL_SCARF, - HybridAquaticItems.MOON_JELLYFISH_HAT, - HybridAquaticItems.NAUTILUS_HELMET, - HybridAquaticItems.NAUTILUS_PAULDRONS, - HybridAquaticItems.DIVING_HELMET, - HybridAquaticItems.DIVING_SUIT, - HybridAquaticItems.DIVING_LEGGINGS, - HybridAquaticItems.DIVING_BOOTS, - ).forEach { item -> - getOrCreateTagBuilder(HybridAquaticItemTags.ARMORS).add(item) - } +// setOf( +// HybridAquaticItems.MOON_JELLYFISH_HAT, +// HybridAquaticItems.MANGLERFISH_LURE, +// ).forEach { item -> +// getOrCreateTagBuilder(HybridAquaticItemTags.HAT).add(item) +// } +// +// setOf( +// HybridAquaticItems.EEL_SCARF, +// ).forEach { item -> +// getOrCreateTagBuilder(HybridAquaticItemTags.SCARF).add(item) +// } +// +// setOf( +// HybridAquaticItems.MANGLERFISH_FIN, +// ).forEach { item -> +// getOrCreateTagBuilder(HybridAquaticItemTags.BACK_FIN).add(item) +// } + +// setOf( +// HybridAquaticItems.MANGLERFISH_LURE, +// HybridAquaticItems.MANGLERFISH_FIN, +// HybridAquaticItems.EEL_SCARF, +// HybridAquaticItems.MOON_JELLYFISH_HAT, +// HybridAquaticItems.NAUTILUS_HELMET, +// HybridAquaticItems.NAUTILUS_PAULDRONS, +// HybridAquaticItems.DIVING_HELMET, +// HybridAquaticItems.DIVING_SUIT, +// HybridAquaticItems.DIVING_LEGGINGS, +// HybridAquaticItems.DIVING_BOOTS, +// ).forEach { item -> +// getOrCreateTagBuilder(HybridAquaticItemTags.ARMORS).add(item) +// } } } diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/DivingArmorItem.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/DivingArmorItem.kt index daa17f699..843b6e137 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/item/DivingArmorItem.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/item/DivingArmorItem.kt @@ -1,31 +1,31 @@ -package dev.hybridlabs.aquatic.item - -import dev.hybridlabs.aquatic.client.GeoRenderProviderStorage -import net.minecraft.item.ArmorItem -import net.minecraft.item.ArmorMaterial -import software.bernie.geckolib.animatable.GeoItem -import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache -import software.bernie.geckolib.core.animation.AnimatableManager -import software.bernie.geckolib.util.GeckoLibUtil -import java.util.function.Consumer -import java.util.function.Supplier - -class DivingArmorItem(material: ArmorMaterial, type: Type, settings: Settings) : ArmorItem(material, type, settings), GeoItem { - private val cache: AnimatableInstanceCache = GeckoLibUtil.createInstanceCache(this) - private val renderProvider: Supplier = GeoItem.makeRenderer(this) - - override fun createRenderer(consumer: Consumer) { - consumer.accept(GeoRenderProviderStorage.divingArmorRenderProvider.invoke()) - } - - override fun registerControllers(registrar: AnimatableManager.ControllerRegistrar) { - } - - override fun getRenderProvider(): Supplier { - return renderProvider - } - - override fun getAnimatableInstanceCache(): AnimatableInstanceCache { - return cache - } -} +//package dev.hybridlabs.aquatic.item +// +//import dev.hybridlabs.aquatic.client.GeoRenderProviderStorage +//import net.minecraft.item.ArmorItem +//import net.minecraft.item.ArmorMaterial +//import software.bernie.geckolib.animatable.GeoItem +//import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache +//import software.bernie.geckolib.core.animation.AnimatableManager +//import software.bernie.geckolib.util.GeckoLibUtil +//import java.util.function.Consumer +//import java.util.function.Supplier +// +//class DivingArmorItem(material: ArmorMaterial, type: Type, settings: Settings) : ArmorItem(material, type, settings), GeoItem { +// private val cache: AnimatableInstanceCache = GeckoLibUtil.createInstanceCache(this) +// private val renderProvider: Supplier = GeoItem.makeRenderer(this) +// +// override fun createRenderer(consumer: Consumer) { +// consumer.accept(GeoRenderProviderStorage.divingArmorRenderProvider.invoke()) +// } +// +// override fun registerControllers(registrar: AnimatableManager.ControllerRegistrar) { +// } +// +// override fun getRenderProvider(): Supplier { +// return renderProvider +// } +// +// override fun getAnimatableInstanceCache(): AnimatableInstanceCache { +// return cache +// } +//} diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt index 9f0850daa..fdda00068 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt @@ -206,7 +206,7 @@ object HybridAquaticItemGroups { entries.add(HybridAquaticItems.LIGHTFOOT_CRAB_CLAW) entries.add(HybridAquaticItems.YETI_CRAB_CLAW) entries.add(HybridAquaticItems.SPIDER_CRAB_CLAW) - entries.add(HybridAquaticItems.KARKINOS_CLAW) + //entries.add(HybridAquaticItems.KARKINOS_CLAW) entries.add(HybridAquaticItems.GLOW_SLIME) entries.add(HybridAquaticItems.SHARK_TOOTH) entries.add(HybridAquaticItems.PEARL) @@ -238,18 +238,18 @@ object HybridAquaticItemGroups { entries.add(HybridAquaticItems.CORAL_HOE) entries.add(HybridAquaticItems.FISHING_NET) - entries.add(HybridAquaticItems.DIVING_HELMET) - entries.add(HybridAquaticItems.DIVING_SUIT) - entries.add(HybridAquaticItems.DIVING_LEGGINGS) - entries.add(HybridAquaticItems.DIVING_BOOTS) - entries.add(HybridAquaticItems.NAUTILUS_HELMET) - entries.add(HybridAquaticItems.NAUTILUS_PAULDRONS) - entries.add(Items.TURTLE_HELMET) - entries.add(HybridAquaticItems.TURTLE_CHESTPLATE) - entries.add(HybridAquaticItems.MANGLERFISH_LURE) - entries.add(HybridAquaticItems.MANGLERFISH_FIN) - entries.add(HybridAquaticItems.EEL_SCARF) - entries.add(HybridAquaticItems.MOON_JELLYFISH_HAT) +// entries.add(HybridAquaticItems.DIVING_HELMET) +// entries.add(HybridAquaticItems.DIVING_SUIT) +// entries.add(HybridAquaticItems.DIVING_LEGGINGS) +// entries.add(HybridAquaticItems.DIVING_BOOTS) +// entries.add(HybridAquaticItems.NAUTILUS_HELMET) +// entries.add(HybridAquaticItems.NAUTILUS_PAULDRONS) +// entries.add(Items.TURTLE_HELMET) +// entries.add(HybridAquaticItems.TURTLE_CHESTPLATE) +// entries.add(HybridAquaticItems.MANGLERFISH_LURE) +// entries.add(HybridAquaticItems.MANGLERFISH_FIN) +// entries.add(HybridAquaticItems.EEL_SCARF) +// entries.add(HybridAquaticItems.MOON_JELLYFISH_HAT) // spawn eggs diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt index fb957b7bd..8779b7eee 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt @@ -21,76 +21,76 @@ import net.minecraft.util.math.Direction object HybridAquaticItems { //#region Armor - val DIVING_HELMET: Item = register( - "diving_helmet", - DivingArmorItem(HybridAquaticArmorMaterials.DIVING, ArmorItem.Type.HELMET, FabricItemSettings().maxCount(1)) - ) - - val DIVING_SUIT: Item = register( - "diving_suit", - DivingArmorItem(HybridAquaticArmorMaterials.DIVING, ArmorItem.Type.CHESTPLATE, FabricItemSettings().maxCount(1)) - ) - - val DIVING_LEGGINGS: Item = register( - "diving_leggings", - DivingArmorItem(HybridAquaticArmorMaterials.DIVING, ArmorItem.Type.LEGGINGS, FabricItemSettings().maxCount(1)) - ) - - val DIVING_BOOTS: Item = register( - "diving_boots", - DivingArmorItem(HybridAquaticArmorMaterials.DIVING, ArmorItem.Type.BOOTS, FabricItemSettings().maxCount(1)) - ) - - val NAUTILUS_HELMET: Item = register( - "nautilus_helmet", - SeashellArmorItem(HybridAquaticArmorMaterials.SEASHELL, ArmorItem.Type.HELMET, FabricItemSettings().maxCount(1)) - ) - - val NAUTILUS_PAULDRONS: Item = register( - "nautilus_pauldrons", - SeashellArmorItem( - HybridAquaticArmorMaterials.SEASHELL, - ArmorItem.Type.CHESTPLATE, - FabricItemSettings().maxCount(1) - ) - ) - - val TURTLE_CHESTPLATE: Item = register( - "turtle_chestplate", - TurtleArmorItem(HybridAquaticArmorMaterials.TURTLE, ArmorItem.Type.CHESTPLATE, FabricItemSettings().maxCount(1)) - ) - - val MANGLERFISH_LURE: Item = register( - "manglerfish_lure", - ManglerfishArmorItem( - HybridAquaticArmorMaterials.MANGLERFISH, - ArmorItem.Type.HELMET, - FabricItemSettings().maxCount(1) - ) - ) - - val MANGLERFISH_FIN: Item = register( - "manglerfish_fin", - ManglerfishArmorItem( - HybridAquaticArmorMaterials.MANGLERFISH, - ArmorItem.Type.CHESTPLATE, - FabricItemSettings().maxCount(1) - ) - ) - - val EEL_SCARF: Item = register( - "eel_scarf", - EelArmorItem(HybridAquaticArmorMaterials.EEL, ArmorItem.Type.CHESTPLATE, FabricItemSettings().maxCount(1)) - ) - - val MOON_JELLYFISH_HAT: Item = register( - "moon_jellyfish_hat", - MoonJellyfishArmorItem( - HybridAquaticArmorMaterials.MOONJELLYFISH, - ArmorItem.Type.HELMET, - FabricItemSettings().maxCount(1) - ) - ) +// val DIVING_HELMET: Item = register( +// "diving_helmet", +// DivingArmorItem(HybridAquaticArmorMaterials.DIVING, ArmorItem.Type.HELMET, FabricItemSettings().maxCount(1)) +// ) +// +// val DIVING_SUIT: Item = register( +// "diving_suit", +// DivingArmorItem(HybridAquaticArmorMaterials.DIVING, ArmorItem.Type.CHESTPLATE, FabricItemSettings().maxCount(1)) +// ) +// +// val DIVING_LEGGINGS: Item = register( +// "diving_leggings", +// DivingArmorItem(HybridAquaticArmorMaterials.DIVING, ArmorItem.Type.LEGGINGS, FabricItemSettings().maxCount(1)) +// ) +// +// val DIVING_BOOTS: Item = register( +// "diving_boots", +// DivingArmorItem(HybridAquaticArmorMaterials.DIVING, ArmorItem.Type.BOOTS, FabricItemSettings().maxCount(1)) +// ) + +// val NAUTILUS_HELMET: Item = register( +// "nautilus_helmet", +// SeashellArmorItem(HybridAquaticArmorMaterials.SEASHELL, ArmorItem.Type.HELMET, FabricItemSettings().maxCount(1)) +// ) +// +// val NAUTILUS_PAULDRONS: Item = register( +// "nautilus_pauldrons", +// SeashellArmorItem( +// HybridAquaticArmorMaterials.SEASHELL, +// ArmorItem.Type.CHESTPLATE, +// FabricItemSettings().maxCount(1) +// ) +// ) +// +// val TURTLE_CHESTPLATE: Item = register( +// "turtle_chestplate", +// TurtleArmorItem(HybridAquaticArmorMaterials.TURTLE, ArmorItem.Type.CHESTPLATE, FabricItemSettings().maxCount(1)) +// ) +// +// val MANGLERFISH_LURE: Item = register( +// "manglerfish_lure", +// ManglerfishArmorItem( +// HybridAquaticArmorMaterials.MANGLERFISH, +// ArmorItem.Type.HELMET, +// FabricItemSettings().maxCount(1) +// ) +// ) +// +// val MANGLERFISH_FIN: Item = register( +// "manglerfish_fin", +// ManglerfishArmorItem( +// HybridAquaticArmorMaterials.MANGLERFISH, +// ArmorItem.Type.CHESTPLATE, +// FabricItemSettings().maxCount(1) +// ) +// ) +// +// val EEL_SCARF: Item = register( +// "eel_scarf", +// EelArmorItem(HybridAquaticArmorMaterials.EEL, ArmorItem.Type.CHESTPLATE, FabricItemSettings().maxCount(1)) +// ) +// +// val MOON_JELLYFISH_HAT: Item = register( +// "moon_jellyfish_hat", +// MoonJellyfishArmorItem( +// HybridAquaticArmorMaterials.MOONJELLYFISH, +// ArmorItem.Type.HELMET, +// FabricItemSettings().maxCount(1) +// ) +// ) //#endregion @@ -99,7 +99,7 @@ object HybridAquaticItems { val SEA_MESSAGE_BOOK = register("sea_message_book", SeaMessageBookItem(FabricItemSettings())) val FISHING_NET = register("fishing_net", FishingNetItem(FabricItemSettings().maxCount(1))) val BRINE_BUCKET = register("brine_bucket", BucketItem(HybridAquaticFluids.BRINE, FabricItemSettings().maxCount(1))) - val KARKINOS_CLAW = register("karkinos_claw", KarkinosClawItem(FabricItemSettings().maxCount(1))) + //val KARKINOS_CLAW = register("karkinos_claw", KarkinosClawItem(FabricItemSettings().maxCount(1))) val BARBED_HOOK = register("barbed_hook", HookItem(Item.Settings().maxDamage(16))) val GLOWING_HOOK = register("glowing_hook", HookItem(Item.Settings().maxDamage(16))) @@ -201,7 +201,7 @@ object HybridAquaticItems { //#region Blocks - //#region Nature Blocks + //#region Nature Blocks val ANEMONE = registerBlockItem("anemone", HybridAquaticBlocks.ANEMONE) val STRAWBERRY_ANEMONE = registerBlockItem("strawberry_anemone", HybridAquaticBlocks.STRAWBERRY_ANEMONE) @@ -214,7 +214,7 @@ object HybridAquaticItems { val TUBE_WORM = registerBlockItem("tube_worm", HybridAquaticBlocks.TUBE_WORM) val TUBE_SPONGE = registerBlockItem("tube_sponge", HybridAquaticBlocks.TUBE_SPONGE) - //#region Coral Blocks + //#region Coral Blocks val BUTTON_CORAL_BLOCK = registerBlockItem("button_coral_block", HybridAquaticBlocks.BUTTON_CORAL_BLOCK) val DEAD_BUTTON_CORAL_BLOCK = registerBlockItem("dead_button_coral_block", HybridAquaticBlocks.DEAD_BUTTON_CORAL_BLOCK) @@ -244,17 +244,17 @@ object HybridAquaticItems { val THORN_CORAL_FAN = registerVerticallyAttachable("thorn_coral_fan", HybridAquaticBlocks.THORN_CORAL_FAN, HybridAquaticBlocks.THORN_CORAL_WALL_FAN) val DEAD_THORN_CORAL_FAN = registerVerticallyAttachable("dead_thorn_coral_fan", HybridAquaticBlocks.DEAD_THORN_CORAL_FAN, HybridAquaticBlocks.DEAD_THORN_CORAL_WALL_FAN) - //#endregion + //#endregion - //#endregion + //#endregion - //#region Artificial Blocks + //#region Artificial Blocks val BUOY = registerPlaceableInWaterBlockItem("buoy", HybridAquaticBlocks.BUOY) val GLOWSTICK = registerVerticallyAttachable("glowstick", HybridAquaticBlocks.GLOWSTICK, HybridAquaticBlocks.WALL_GLOWSTICK) val MESSAGE_IN_A_BOTTLE = register("message_in_a_bottle", MessageInABottleItem(FabricItemSettings())) - //#region Plushies + //#region Plushies val BASKING_SHARK_PLUSHIE = registerBlockItem("basking_shark_plushie", HybridAquaticBlocks.BASKING_SHARK_PLUSHIE) val BULL_SHARK_PLUSHIE = registerBlockItem("bull_shark_plushie", HybridAquaticBlocks.BULL_SHARK_PLUSHIE) @@ -265,9 +265,9 @@ object HybridAquaticItems { val TIGER_SHARK_PLUSHIE = registerBlockItem("tiger_shark_plushie", HybridAquaticBlocks.TIGER_SHARK_PLUSHIE) val WHALE_SHARK_PLUSHIE = registerBlockItem("whale_shark_plushie", HybridAquaticBlocks.WHALE_SHARK_PLUSHIE) - //#endregion + //#endregion - //#region Crates + //#region Crates val CRAB_POT = registerBlockItem("crab_pot", HybridAquaticBlocks.CRAB_POT) val HYBRID_CRATE = registerBlockItem("hybrid_crate", HybridAquaticBlocks.HYBRID_CRATE) @@ -280,9 +280,9 @@ object HybridAquaticItems { val MANGROVE_CRATE = registerBlockItem("mangrove_crate", HybridAquaticBlocks.MANGROVE_CRATE) val CHERRY_CRATE = registerBlockItem("cherry_crate", HybridAquaticBlocks.CHERRY_CRATE) - //#endregion + //#endregion - //#region Wood Blocks + //#region Wood Blocks val DRIFTWOOD_PLANKS = registerBlockItem("driftwood_planks", HybridAquaticBlocks.DRIFTWOOD_PLANKS) val DRIFTWOOD_LOG = registerBlockItem("driftwood_log", HybridAquaticBlocks.DRIFTWOOD_LOG) @@ -298,9 +298,9 @@ object HybridAquaticItems { val DRIFTWOOD_PRESSURE_PLATE = registerBlockItem("driftwood_pressure_plate", HybridAquaticBlocks.DRIFTWOOD_PRESSURE_PLATE) val DRIFTWOOD_BUTTON = registerBlockItem("driftwood_button", HybridAquaticBlocks.DRIFTWOOD_BUTTON) - //#endregion + //#endregion - //#endregion + //#endregion //#endregion @@ -1290,7 +1290,7 @@ object HybridAquaticItems { //#region Spawn Eggs - //#region Fish + //#region Fish val AFRICAN_BUTTERFLY_SPAWN_EGG = registerSpawnEgg("african_butterfly_spawn_egg", HybridAquaticEntityTypes.AFRICAN_BUTTERFLY, 0xb57955, 0x1e3555) val BARRELEYE_SPAWN_EGG = registerSpawnEgg("barreleye_spawn_egg", HybridAquaticEntityTypes.BARRELEYE, 0x4b4343, 0x6bc96c) @@ -1330,9 +1330,9 @@ object HybridAquaticItems { val TUNA_SPAWN_EGG = registerSpawnEgg("tuna_spawn_egg", HybridAquaticEntityTypes.TUNA, 0x36668d, 0xf5d58d) val GOLDEN_DORADO_SPAWN_EGG = registerSpawnEgg("golden_dorado_spawn_egg", HybridAquaticEntityTypes.GOLDEN_DORADO, 0x36668d, 0xf5d58d) - //#endregion + //#endregion - //#region Deep Sea Fish + //#region Deep Sea Fish val ANGLERFISH_SPAWN_EGG = registerSpawnEgg("anglerfish_spawn_egg", HybridAquaticEntityTypes.ANGLERFISH, 0x4b4257, 0xa7f1eb) val COELACANTH_SPAWN_EGG = registerSpawnEgg("coelacanth_spawn_egg", HybridAquaticEntityTypes.COELACANTH, 0x2f517a, 0xbac4d3) @@ -1342,26 +1342,26 @@ object HybridAquaticItems { val OARFISH_SPAWN_EGG = registerSpawnEgg("oarfish_spawn_egg", HybridAquaticEntityTypes.OARFISH, 0x8892ab, 0xb04743) val RATFISH_SPAWN_EGG = registerSpawnEgg("ratfish_spawn_egg", HybridAquaticEntityTypes.RATFISH, 0xa16470, 0x673146) - //#endregion + //#endregion - //#region Cephalopod + //#region Cephalopod val CUTTLEFISH_SPAWN_EGG = registerSpawnEgg("cuttlefish_spawn_egg", HybridAquaticEntityTypes.CUTTLEFISH, 0x8a4836, 0xf6deae) val ARROW_SQUID_SPAWN_EGG = registerSpawnEgg("arrow_squid_spawn_egg", HybridAquaticEntityTypes.ARROW_SQUID, 0x761f31, 0xd56360) val FIREFLY_SQUID_SPAWN_EGG = registerSpawnEgg("firefly_squid_spawn_egg", HybridAquaticEntityTypes.FIREFLY_SQUID, 0xc93a61, 0x4ec0e8) - //#endregion + //#endregion - //#region Deep Sea Cephalopod + //#region Deep Sea Cephalopod val GLOWING_SUCKER_OCTOPUS_SPAWN_EGG = registerSpawnEgg("glowing_sucker_octopus_spawn_egg", HybridAquaticEntityTypes.GLOWING_SUCKER_OCTOPUS, 0x892f4f, 0x84d5fe) val NAUTILUS_SPAWN_EGG = registerSpawnEgg("nautilus_spawn_egg", HybridAquaticEntityTypes.NAUTILUS, 0xd4ccc3, 0xae4635) val UMBRELLA_OCTOPUS_SPAWN_EGG = registerSpawnEgg("umbrella_octopus_spawn_egg", HybridAquaticEntityTypes.UMBRELLA_OCTOPUS, 0xffaf25, 0xfeff92) val VAMPIRE_SQUID_SPAWN_EGG = registerSpawnEgg("vampire_squid_spawn_egg", HybridAquaticEntityTypes.VAMPIRE_SQUID, 0x73363c, 0xc3e9e2) - //#endregion + //#endregion - //#region Jellyfish + //#region Jellyfish val BARREL_JELLYFISH_SPAWN_EGG = registerSpawnEgg("barrel_jellyfish_spawn_egg", HybridAquaticEntityTypes.BARREL_JELLYFISH, 0xd6f3ea, 0x413c83) val BLUE_JELLYFISH_SPAWN_EGG = registerSpawnEgg("blue_jellyfish_spawn_egg", HybridAquaticEntityTypes.BLUE_JELLYFISH, 0x4dc0e8, 0xff6b97) @@ -1374,9 +1374,9 @@ object HybridAquaticItems { val SEA_NETTLE_SPAWN_EGG = registerSpawnEgg("sea_nettle_spawn_egg", HybridAquaticEntityTypes.SEA_NETTLE, 0xf7bc78, 0x76435f) val BOX_JELLYFISH_SPAWN_EGG = registerSpawnEgg("box_jellyfish_spawn_egg", HybridAquaticEntityTypes.BOX_JELLYFISH, 0x9ba6de, 0xebeff8) - //#endregion + //#endregion - //#region Deep Sea Jellyfish + //#region Deep Sea Jellyfish val MAUVE_STINGER_SPAWN_EGG = registerSpawnEgg("mauve_stinger_spawn_egg", HybridAquaticEntityTypes.MAUVE_STINGER, 0x633063, 0xbc787a) val ATOLLA_JELLYFISH_SPAWN_EGG = registerSpawnEgg("atolla_jellyfish_spawn_egg", HybridAquaticEntityTypes.ATOLLA_JELLYFISH, 0xa32858, 0x4dc0e8) @@ -1384,9 +1384,9 @@ object HybridAquaticItems { val COSMIC_JELLYFISH_SPAWN_EGG = registerSpawnEgg("cosmic_jellyfish_spawn_egg", HybridAquaticEntityTypes.COSMIC_JELLYFISH, 0xe7debb, 0xffd375) val FIREWORK_JELLYFISH_SPAWN_EGG = registerSpawnEgg("firework_jellyfish_spawn_egg", HybridAquaticEntityTypes.FIREWORK_JELLYFISH, 0x6975e8, 0xfc7fb7) - //#endregion + //#endregion - //#region Crustaceans + //#region Crustaceans val COCONUT_CRAB_SPAWN_EGG = registerSpawnEgg("coconut_crab_spawn_egg", HybridAquaticEntityTypes.COCONUT_CRAB, 0x3e2d25, 0x3c546d) val DUNGENESS_CRAB_SPAWN_EGG = registerSpawnEgg("dungeness_crab_spawn_egg", HybridAquaticEntityTypes.DUNGENESS_CRAB, 0x81353f, 0xeecfce) @@ -1402,24 +1402,24 @@ object HybridAquaticItems { val SHRIMP_SPAWN_EGG = registerSpawnEgg("shrimp_spawn_egg", HybridAquaticEntityTypes.SHRIMP, 0xeb564b, 0xff9166) val VAMPIRE_CRAB_SPAWN_EGG = registerSpawnEgg("vampire_crab_spawn_egg", HybridAquaticEntityTypes.VAMPIRE_CRAB, 0x322947, 0x752053) - //#endregion + //#endregion - //#region Deep Sea Crustaceans + //#region Deep Sea Crustaceans val GIANT_ISOPOD_SPAWN_EGG = registerSpawnEgg("giant_isopod_spawn_egg", HybridAquaticEntityTypes.GIANT_ISOPOD, 0xe6d3d6, 0x3c2236) val SPIDER_CRAB_SPAWN_EGG = registerSpawnEgg("spider_crab_spawn_egg", HybridAquaticEntityTypes.SPIDER_CRAB, 0x9d3e41, 0xc6836f) val YETI_CRAB_SPAWN_EGG = registerSpawnEgg("yeti_crab_spawn_egg", HybridAquaticEntityTypes.YETI_CRAB, 0xfff4dd, 0xffd16b) - //#endregion + //#endregion - //#region Miniboss + //#region Miniboss val KARKINOS_SPAWN_EGG = registerSpawnEgg("karkinos_spawn_egg", HybridAquaticEntityTypes.KARKINOS, 0x852c2a, 0x3d1031) val MANGLERFISH_SPAWN_EGG = registerSpawnEgg("manglerfish_spawn_egg", HybridAquaticEntityTypes.MANGLERFISH, 0x44404d, 0x74e5d5) - //#endregion + //#endregion - //#region Critters + //#region Critters val NUDIBRANCH_SPAWN_EGG = registerSpawnEgg("nudibranch_spawn_egg", HybridAquaticEntityTypes.NUDIBRANCH, 0xf7be47, 0xb853a3) val SEA_CUCUMBER_SPAWN_EGG = registerSpawnEgg("sea_cucumber_spawn_egg", HybridAquaticEntityTypes.SEA_CUCUMBER, 0x225b6d, 0x0c2627) @@ -1427,9 +1427,9 @@ object HybridAquaticItems { val STARFISH_SPAWN_EGG = registerSpawnEgg("starfish_spawn_egg", HybridAquaticEntityTypes.STARFISH, 0x994066, 0x592645) val SEA_ANGEL_SPAWN_EGG = registerSpawnEgg("sea_angel_spawn_egg", HybridAquaticEntityTypes.SEA_ANGEL, 0xc6d5f9, 0xf38135) - //#endregion + //#endregion - //#region Sharks + //#region Sharks val BASKING_SHARK_SPAWN_EGG = registerSpawnEgg("basking_shark_spawn_egg", HybridAquaticEntityTypes.BASKING_SHARK, 0x725e6b, 0x201b1b) val BULL_SHARK_SPAWN_EGG = registerSpawnEgg("bull_shark_spawn_egg", HybridAquaticEntityTypes.BULL_SHARK, 0x676b8d, 0xd0ccda) @@ -1441,7 +1441,7 @@ object HybridAquaticItems { val TIGER_SHARK_SPAWN_EGG = registerSpawnEgg("tiger_shark_spawn_egg", HybridAquaticEntityTypes.TIGER_SHARK, 0x3e3943, 0xf4f2f3) val WHALE_SHARK_SPAWN_EGG = registerSpawnEgg("whale_shark_spawn_egg", HybridAquaticEntityTypes.WHALE_SHARK, 0x1a1932, 0xffffff) - //#endregion + //#endregion //#endregion diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/KarkinosClawItem.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/KarkinosClawItem.kt index 81f294dcb..cdf8b914f 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/item/KarkinosClawItem.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/item/KarkinosClawItem.kt @@ -1,30 +1,30 @@ -package dev.hybridlabs.aquatic.item - -import com.google.common.collect.ImmutableMultimap -import com.google.common.collect.Multimap -import com.jamieswhiteshirt.reachentityattributes.ReachEntityAttributes -import net.minecraft.entity.EquipmentSlot -import net.minecraft.entity.attribute.EntityAttribute -import net.minecraft.entity.attribute.EntityAttributeModifier -import net.minecraft.item.Item -import net.minecraft.item.ItemStack -import java.util.* - -class KarkinosClawItem(settings: Settings): Item(settings) { - - private var attributes: Multimap - - init { - val builder = ImmutableMultimap.builder() - builder.put(ReachEntityAttributes.REACH, EntityAttributeModifier(UUID.fromString("592e9225-a554-42c9-9366-0fe5c53d9305"), "Reach modifier", 3.0, EntityAttributeModifier.Operation.ADDITION)) - attributes = builder.build() - } - - override fun getAttributeModifiers( - stack: ItemStack, - slot: EquipmentSlot - ): Multimap { - return if(slot == EquipmentSlot.OFFHAND) attributes - else super.getAttributeModifiers(stack, slot) - } -} \ No newline at end of file +//package dev.hybridlabs.aquatic.item +// +//import com.google.common.collect.ImmutableMultimap +//import com.google.common.collect.Multimap +//import com.jamieswhiteshirt.reachentityattributes.ReachEntityAttributes +//import net.minecraft.entity.EquipmentSlot +//import net.minecraft.entity.attribute.EntityAttribute +//import net.minecraft.entity.attribute.EntityAttributeModifier +//import net.minecraft.item.Item +//import net.minecraft.item.ItemStack +//import java.util.* +// +//class KarkinosClawItem(settings: Settings): Item(settings) { +// +// private var attributes: Multimap +// +// init { +// val builder = ImmutableMultimap.builder() +// builder.put(ReachEntityAttributes.REACH, EntityAttributeModifier(UUID.fromString("592e9225-a554-42c9-9366-0fe5c53d9305"), "Reach modifier", 3.0, EntityAttributeModifier.Operation.ADDITION)) +// attributes = builder.build() +// } +// +// override fun getAttributeModifiers( +// stack: ItemStack, +// slot: EquipmentSlot +// ): Multimap { +// return if(slot == EquipmentSlot.OFFHAND) attributes +// else super.getAttributeModifiers(stack, slot) +// } +//} \ No newline at end of file