[1.20.1-1.0.7.beta1] - 2023-10-23

CHANGELOG.md

@@ -2,7 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.20.1-1.0.6] - 2023-10-19
+## [1.20.1-1.0.7.beta1] - 2023-10-23
+
+### Added Thor hammer. This is a work in progress and will be updated in the future.
+### Worthy enchantment is obtained by killing the ender dragon. This will allow then allowing you to get the hammer.
+### Pressing M while having the effect 'worthy' will allow you to get the hammer.
+### Pressing Z while having the effect 'worthy' will allow you to strike lightning. (Disabled for now due to issues)
+### Striking an entity with the hammer will cause lightning to strike the entity.
+### Added a new logo for the mod.
+### Fixed a few bugs.
+### Current known issues:
+### — When the hammer is thrown, it will be rendered as black lines. This is due to the model not being rendered properly.
+### — Pressing Z while having the effect 'worthy' will at this point cause no lightning to strike. This is due to there being an issue in getting the lighting to hit the entity or block.
+
+## [1.20.1-1.0.6] - 2023-10-13
 
 ### Added Ingot Fusion Enchanter (been in the works for a month with more than two rewrites) :
 ### This allows you to upgrade certain items. Currently only works with the MAGMA_STRIKE_PICKAXE. More to come in the future.
@@ -12,7 +25,6 @@ All notable changes to this project will be documented in this file.
 ### Issue with how the item recipes are being displayed in the custom tool crafting tables. Will be fixed in the future.
 ### Added support for enchanted items to be crafted in the custom crafting tables.
 ### Fixed some other issues I came across while testing.
-### Big update coming soon adding thors hammer, and a few more exciting things.
 
 ## [1.20.1-1.0.5] - 2023-09-26
 

README.md

@@ -4,6 +4,7 @@
 [![](http://cf.way2muchnoise.eu/480779.svg)](https://www.curseforge.com/minecraft/mc-mods/armour-and-items-mod)
 [![](http://cf.way2muchnoise.eu/versions/480779.svg)](https://www.curseforge.com/minecraft/mc-mods/armour-and-items-mod)
 [![License: Apache License](https://img.shields.io/badge/License-Apache_License-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Java CI](https://github.com/RealYusufIsmail-Mc-Mods/Armour-and-Tools-Mod/actions/workflows/gradle.yml/badge.svg)](https://github.com/RealYusufIsmail-Mc-Mods/Armour-and-Tools-Mod/actions/workflows/gradle.yml)
 
 # This Mod is currently being reworked so please be patient while things are being implemented.
 

build.gradle.kts

@@ -29,7 +29,7 @@ plugins {
 
 project.group = "io.github.realyusufismail"
 
-project.version = "1.20.1-1.0.6.1"
+project.version = "1.20.1-1.0.7.beta1"
 
 base.archivesName.set("armourandtoolsmod")
 
@@ -146,21 +146,27 @@ repositories {
     maven { url = uri("https://maven.blamejared.com") }
     maven { url = uri("https://dvs1.progwml6.com/files/maven/") }
     maven { url = uri("https://modmaven.dev") }
+    maven { url = uri("https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/") }
     mavenCentral()
 }
 
 dependencies {
     minecraft("net.minecraftforge:forge:" + properties["forgeVersion"])
+
     // kotlin forge
     implementation("thedarkcolour:kotlinforforge:" + properties["kotlinForForgeVersion"])
+
     // Logger
     implementation("ch.qos.logback:logback-classic:" + properties["logbackVersion"])
     implementation("ch.qos.logback:logback-core:" + properties["logbackVersion"])
-    // test
-    testImplementation("org.junit.jupiter:junit-jupiter:" + properties["junitVersion"])
+
     // core
     implementation("io.github.realyusufismail:realyusufismailcore:" + properties["coreVersion"])
 
+    // Geckolib4 for animation engine.
+    // implementation(fg.deobf("software.bernie.geckolib:geckolib-forge-" + mcVersion + ":" +
+    // properties["geckolibVersion"]))
+
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
     compileOnly(fg.deobf("mezz.jei:jei-${mcVersion}-common-api:" + properties["jeiVersion"]))
     compileOnly(fg.deobf("mezz.jei:jei-${mcVersion}-forge-api:" + properties["jeiVersion"]))
@@ -169,6 +175,13 @@ dependencies {
     // lombok
     compileOnly("org.projectlombok:lombok:" + properties["lombokVersion"])
     annotationProcessor("org.projectlombok:lombok:" + properties["lombokVersion"])
+
+    // Json
+    implementation(
+        "com.fasterxml.jackson.module:jackson-module-kotlin:" + properties["jacksonVersion"])
+
+    // test
+    testImplementation("org.junit.jupiter:junit-jupiter:" + properties["junitVersion"])
 }
 
 tasks.test {

gradle.properties

@@ -8,4 +8,6 @@ logbackVersion = 1.4.11
 junitVersion = 5.10.0
 coreVersion = 1.20.1-1.0.1
 jeiVersion = 15.2.0.27
-lombokVersion = 1.18.30
+lombokVersion = 1.18.30
+geckolibVersion = 4.2.3
+jacksonVersion = 2.15.3

settings.gradle.kts

@@ -4,9 +4,13 @@ pluginManagement {
     repositories {
         maven(url = uri("https://maven.minecraftforge.net/"))
         maven(url = uri("https://maven.parchmentmc.org"))
+        maven(url = uri("https://repo.spongepowered.org/repository/maven-public/"))
         mavenCentral()
         gradlePluginPortal()
     }
 
-    plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" }
+    plugins {
+        id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+        id("org.spongepowered.mixin") version "0.7.0"
+    }
 }

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.20.1	2023-10-13T09:46:45.7593442	Recipes
+// 1.20.1	2023-10-23T07:56:53.0671898	Recipes
 64b2fa52dbca9188c5fed6b3a1d1426c2b380ed1 data/armourandtoolsmod/advancements/recipes/building_blocks/aqumarine_block_recipe.json
 7d54606f53db4f400123dfb6907c02f087b53786 data/armourandtoolsmod/advancements/recipes/building_blocks/custom_armour_crafting_table_recipe.json
 9c72e5c5a44803c45a34320f73263008e4bada72 data/armourandtoolsmod/advancements/recipes/building_blocks/custom_tool_crafting_table_recipe.json
@@ -302,7 +302,7 @@ ad0c097621f95c5b6ecf7071f400c04d0a0539e1 data/armourandtoolsmod/recipes/graphite
 186a1e677fe29e54cd3f9266473edddc24ecd969 data/armourandtoolsmod/recipes/imperium_pickaxe.json
 b38e6d05408603e66f68bca8e1f130a81f2b3878 data/armourandtoolsmod/recipes/imperium_sword.json
 eb7bc1fd278b7b1e16aab1d6068656a0b69c6d36 data/armourandtoolsmod/recipes/ingot_fusion_toll_enhancer_recipe.json
-dcadccfdd9e219de6e433b1b34cf5c1a20aaee73 data/armourandtoolsmod/recipes/magma_strike_pickaxe.json
+cf0f2ab2d22ab8591df43b054cb613d21c911667 data/armourandtoolsmod/recipes/magma_strike_pickaxe.json
 0399917d7fdda6f9af410c709805dfb149b2451c data/armourandtoolsmod/recipes/rainbow_block_recipe.json
 9e4117f89e11f11fb8d19b1981e215582e5ac0b5 data/armourandtoolsmod/recipes/rainbow_boots.json
 acc1a952978e1ddef1c694f2b0f5f84a69cd5c6b data/armourandtoolsmod/recipes/rainbow_chestplate.json

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

@@ -1,2 +1,2 @@
-// 1.20.1	2023-10-12T22:09:59.3296691	Languages: en_us
-8b0152e07cd1a1ee30bf67cc31642c7f52bea792 assets/armourandtoolsmod/lang/en_us.json
+// 1.20.1	2023-10-23T07:56:53.0874802	Languages: en_us
+f8dcda39029792802a918f6b0516421e336dbfaf assets/armourandtoolsmod/lang/en_us.json

src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0

@@ -1,4 +1,4 @@
-// 1.20.1	2023-10-12T22:09:59.3341749	Advancements
+// 1.20.1	2023-10-23T07:56:53.0911863	Advancements
 615aa58042c1c9ffe9d0ce52c4d2ff2fabafceeb data/armourandtoolsmod/advancements/aqumarine_armour.json
 c646a34402926a2fce2839d07d57bc89bbc36658 data/armourandtoolsmod/advancements/aqumarine_block.json
 1640ef0ec6e127c1afe8e6b060ba29e844d3a9e9 data/armourandtoolsmod/advancements/aqumarine_ingot.json
@@ -7,26 +7,26 @@ c646a34402926a2fce2839d07d57bc89bbc36658 data/armourandtoolsmod/advancements/aqu
 82702fdc364aa859e7007f3a235d922a5309c085 data/armourandtoolsmod/advancements/enderite_block.json
 872f597b5535e0df9e5cb15f4702eb5010bc4425 data/armourandtoolsmod/advancements/enderite_ingot.json
 c3fa9a3a607a56d4ec773619a41cfd889b3a4dea data/armourandtoolsmod/advancements/enderite_ore.json
-abda7f167bd586a37b904d6a599b520e96cf77ed data/armourandtoolsmod/advancements/enderite_tools.json
+1dc71b8a45318d945e2c139f183e647a54f70974 data/armourandtoolsmod/advancements/enderite_tools.json
 b08601bbad0cc8efe4d3845320f4088038e28d43 data/armourandtoolsmod/advancements/graphite_armour.json
 b19cf2c2995b5cccb13b120cf7f939e9da8846f0 data/armourandtoolsmod/advancements/graphite_block.json
 36250e8d2c72bbd2777714185259135746a5322f data/armourandtoolsmod/advancements/graphite_ingot.json
 9adf555b52ffdf629389ea55196ca5cd10282975 data/armourandtoolsmod/advancements/graphite_ore.json
 6d78dca81e0426274ca9944db826df140d7558af data/armourandtoolsmod/advancements/imperium_ingot.json
 14397bc6ac6b9cdb50cc33b5bffdd40d903c864f data/armourandtoolsmod/advancements/imperium_ore.json
-f6a37c07879a2fd2d12fbe264861eb4cb6e50072 data/armourandtoolsmod/advancements/imperium_tools.json
+9d3bf539ece344e47730f78d5867fa8e1dcb4c68 data/armourandtoolsmod/advancements/imperium_tools.json
 5920445e4112df9049a32cfb9f64a6563f3f21ca data/armourandtoolsmod/advancements/rainbow_armour.json
 c823856ed4fd1c9cc14082a0e815cda7d7305692 data/armourandtoolsmod/advancements/rainbow_block.json
 602389b3a613f86e1ae958a052e0635effb8ef6e data/armourandtoolsmod/advancements/rainbow_ingot.json
 329e0594836ad97aee32766907087eb1d595dc0c data/armourandtoolsmod/advancements/rainbow_ore.json
-b7e528b4f7c05752b59d90aca771cee7ca69dbe2 data/armourandtoolsmod/advancements/root.json
+95343b663915230e0123a16b9c92188a264b5817 data/armourandtoolsmod/advancements/root.json
 9af5b955ffcb35aad96b6662a1674a4aeea105a2 data/armourandtoolsmod/advancements/ruby_armour.json
 c7283efe8a10721cc12d6f75e20159542ceb7083 data/armourandtoolsmod/advancements/ruby_block.json
 d5250527b9881cecbda67fbb2daa0b4d5f829dfb data/armourandtoolsmod/advancements/ruby_ingot.json
 a1ebe95e005b5b589e0450811e7d29f0ac2a8f8d data/armourandtoolsmod/advancements/ruby_ore.json
-840aeebcb2077081d0bcdbf48fcfdfaaff564a5a data/armourandtoolsmod/advancements/ruby_tools.json
+fc876a899c6f5004bc5c9432ca7b4c62e09d513d data/armourandtoolsmod/advancements/ruby_tools.json
 9517ee9871d20546e203fa02ad74da1ebf6e55e5 data/armourandtoolsmod/advancements/sapphire_armour.json
 f30aac69475b4ee47e8f123ef95f9e757878f9a2 data/armourandtoolsmod/advancements/sapphire_block.json
 ffb75d4b8f5f71d0785c7465f8dc5ca878ee17d6 data/armourandtoolsmod/advancements/sapphire_ingot.json
 fde1e31a95bf9f1ca6d7fd685b4230dac455c7db data/armourandtoolsmod/advancements/sapphire_ore.json
-0c02f859a1e21fdf6019709481397c132f8a265c data/armourandtoolsmod/advancements/sapphire_tools.json
+6e1f5c89593d14cfff5689ab9de23f4bc9173c9d data/armourandtoolsmod/advancements/sapphire_tools.json

src/generated/resources/assets/armourandtoolsmod/lang/en_us.json

@@ -90,6 +90,7 @@
   "container.ingot_fusion_toll_enhancer": "Ingot Fusion Toll Enhancer",
   "container.ingot_fusion_toll_enhancer.description": "Enhance your tools and armour!",
   "creativetab.armourandtoolsmod": "Armour and Item Mod",
+  "effect.armourandtoolsmod.worthy_effect": "Worthy Potion",
   "item.armourandtoolsmod.amethyst_axe": "Amethyst Axe",
   "item.armourandtoolsmod.amethyst_boots": "Amethyst Boots",
   "item.armourandtoolsmod.amethyst_chestplate": "Amethyst Chestplate",
@@ -105,6 +106,7 @@
   "item.armourandtoolsmod.aqumarine_leggings": "Aqumarine Leggings",
   "item.armourandtoolsmod.aqumarine_shield": "Aqumarine Shield",
   "item.armourandtoolsmod.aqumarine_trident": "Aqumarine Trident",
+  "item.armourandtoolsmod.dragon_destroyer": "Dragon Destroyer",
   "item.armourandtoolsmod.enderite": "Enderite",
   "item.armourandtoolsmod.enderite_axe": "Enderite Axe",
   "item.armourandtoolsmod.enderite_boots": "Enderite Boots",
@@ -125,6 +127,7 @@
   "item.armourandtoolsmod.imperium_pickaxe": "Imperium Pickaxe",
   "item.armourandtoolsmod.imperium_sword": "Imperium Sword",
   "item.armourandtoolsmod.magma_strike_pickaxe": "Magma Strike Pickaxe",
+  "item.armourandtoolsmod.mjolnir": "Mjölnir",
   "item.armourandtoolsmod.rainbow": "Rainbow Ingot",
   "item.armourandtoolsmod.rainbow_boots": "Rainbow Boots",
   "item.armourandtoolsmod.rainbow_chestplate": "Rainbow Chestplate",
@@ -159,5 +162,13 @@
   "item.armourandtoolsmod.sapphire_pickaxe": "Sapphire Pickaxe",
   "item.armourandtoolsmod.sapphire_shield": "Sapphire Shield",
   "item.armourandtoolsmod.sapphire_shovel": "Sapphire Shovel",
-  "item.armourandtoolsmod.sapphire_sword": "Sapphire Sword"
+  "item.armourandtoolsmod.sapphire_sword": "Sapphire Sword",
+  "item.armourandtoolsmod.stormbreaker": "Stormbreaker",
+  "item.minecraft.lingering_potion.effect.worthy_potion": "Worthy Potion",
+  "item.minecraft.potion.effect.worthy_potion": "Worthy Potion",
+  "item.minecraft.splash_potion.effect.worthy_potion": "Worthy Potion",
+  "item.minecraft.tipped_arrow.effect.worthy_potion": "Worthy Potion",
+  "key.categories.armourandtoolsmod": "Armour and Item Mod",
+  "key.get_mjolnir": "Get Mjölnir",
+  "key.strike_lightning": "Strike Lightning"
 }

src/generated/resources/data/armourandtoolsmod/advancements/enderite_tools.json

@@ -70,8 +70,7 @@
     "frame": "goal",
     "hidden": false,
     "icon": {
-      "item": "armourandtoolsmod:enderite_sword",
-      "nbt": "{Damage:0}"
+      "item": "armourandtoolsmod:enderite_sword"
     },
     "show_toast": true,
     "title": {

src/generated/resources/data/armourandtoolsmod/advancements/imperium_tools.json

@@ -34,8 +34,7 @@
     "frame": "goal",
     "hidden": false,
     "icon": {
-      "item": "armourandtoolsmod:imperium_sword",
-      "nbt": "{Damage:0}"
+      "item": "armourandtoolsmod:imperium_sword"
     },
     "show_toast": true,
     "title": {

src/generated/resources/data/armourandtoolsmod/advancements/root.json

@@ -22,8 +22,7 @@
     "frame": "task",
     "hidden": false,
     "icon": {
-      "item": "armourandtoolsmod:amethyst_sword",
-      "nbt": "{Damage:0}"
+      "item": "armourandtoolsmod:amethyst_sword"
     },
     "show_toast": true,
     "title": {

src/generated/resources/data/armourandtoolsmod/advancements/ruby_tools.json

@@ -70,8 +70,7 @@
     "frame": "goal",
     "hidden": false,
     "icon": {
-      "item": "armourandtoolsmod:ruby_sword",
-      "nbt": "{Damage:0}"
+      "item": "armourandtoolsmod:ruby_sword"
     },
     "show_toast": true,
     "title": {

src/generated/resources/data/armourandtoolsmod/advancements/sapphire_tools.json

@@ -70,8 +70,7 @@
     "frame": "goal",
     "hidden": false,
     "icon": {
-      "item": "armourandtoolsmod:sapphire_sword",
-      "nbt": "{Damage:0}"
+      "item": "armourandtoolsmod:sapphire_sword"
     },
     "show_toast": true,
     "title": {

src/generated/resources/data/armourandtoolsmod/recipes/magma_strike_pickaxe.json

@@ -12,7 +12,6 @@
   },
   "result": {
     "count": 1,
-    "item": "armourandtoolsmod:magma_strike_pickaxe",
-    "nbt": "{Damage:0}"
+    "item": "armourandtoolsmod:magma_strike_pickaxe"
   }
 }

src/main/java/io/github/realyusufismail/armourandtoolsmod/client/ArmourAndToolsModTridentItemRendererProvider.java

@@ -18,17 +18,21 @@
  */ 
 package io.github.realyusufismail.armourandtoolsmod.client;
 
-import io.github.realyusufismail.armourandtoolsmod.client.renderer.trident.ister.AqumarineTridentItemRendererISTER;
+import io.github.realyusufismail.armourandtoolsmod.client.renderer.mjolnir.MjolnirItemRendererISTER;
+import io.github.realyusufismail.armourandtoolsmod.client.renderer.trident.aq.AqumarineTridentItemRendererISTER;
 import net.minecraftforge.client.event.RegisterClientReloadListenersEvent;
 import net.minecraftforge.client.extensions.common.IClientItemExtensions;
 
 public class ArmourAndToolsModTridentItemRendererProvider {
   private static AqumarineTridentItemRendererISTER aqumarineTridentItemRendererISTER;
+  private static MjolnirItemRendererISTER mjolnirItemRendererISTER;
 
   public static void init(final RegisterClientReloadListenersEvent event) {
     aqumarineTridentItemRendererISTER = new AqumarineTridentItemRendererISTER();
+    mjolnirItemRendererISTER = new MjolnirItemRendererISTER();
 
     event.registerReloadListener(aqumarineTridentItemRendererISTER);
+    event.registerReloadListener(mjolnirItemRendererISTER);
   }
 
   public static IClientItemExtensions aqumarineTrident() {
@@ -39,4 +43,13 @@ public AqumarineTridentItemRendererISTER getCustomRenderer() {
       }
     };
   }
+
+  public static IClientItemExtensions mjolnir() {
+    return new IClientItemExtensions() {
+      @Override
+      public MjolnirItemRendererISTER getCustomRenderer() {
+        return mjolnirItemRendererISTER;
+      }
+    };
+  }
 }

src/main/java/io/github/realyusufismail/armourandtoolsmod/core/init/EntityTypeInit.java

@@ -21,6 +21,7 @@
 import io.github.realyusufismail.armourandtoolsmod.ArmourAndToolsMod;
 import io.github.realyusufismail.armourandtoolsmod.common.entity.AqumarineTridentEntity;
 import io.github.realyusufismail.armourandtoolsmod.common.entity.ArmourToolsModTridentEntity;
+import io.github.realyusufismail.armourandtoolsmod.common.entity.MjolnirEntity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
 import net.minecraftforge.registries.DeferredRegister;
@@ -47,4 +48,19 @@ public class EntityTypeInit {
                               new AqumarineTridentEntity(
                                   EntityTypeInit.AQUMARINE_THROWN_TRIDENT.get(), world))
                       .build(ArmourAndToolsMod.MOD_ID + ":aqumarine_thrown_trident"));
+
+  public static final RegistryObject<EntityType<ArmourToolsModTridentEntity>> MJOLNIR =
+      ENTITY_TYPES.register(
+          "mjolnir",
+          () ->
+              EntityType.Builder.<ArmourToolsModTridentEntity>of(
+                      MjolnirEntity::new, MobCategory.MISC)
+                  .sized(0.5F, 0.5F)
+                  .fireImmune()
+                  .clientTrackingRange(4)
+                  .updateInterval(20)
+                  .setCustomClientFactory(
+                      (spawnEntity, world) ->
+                          new MjolnirEntity(EntityTypeInit.MJOLNIR.get(), world))
+                  .build(ArmourAndToolsMod.MOD_ID + ":mjolnir_thrown"));
 }

src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/ArmourAndToolsMod.kt

@@ -21,7 +21,7 @@ package io.github.realyusufismail.armourandtoolsmod
 import io.github.realyusufismail.armourandtoolsmod.ArmourAndToolsMod.ArmorAndToolsMod.MOD_ID
 import io.github.realyusufismail.armourandtoolsmod.client.ArmourAndToolsModShieldItemRendererProvider
 import io.github.realyusufismail.armourandtoolsmod.client.ArmourAndToolsModTridentItemRendererProvider
-import io.github.realyusufismail.armourandtoolsmod.client.ClientSetup
+import io.github.realyusufismail.armourandtoolsmod.client.ClientEvents
 import io.github.realyusufismail.armourandtoolsmod.core.init.*
 import io.github.realyusufismail.armourandtoolsmod.datagen.DataGenerators
 import java.util.*
@@ -44,20 +44,29 @@ class ArmourAndToolsMod {
         EntityTypeInit.ENTITY_TYPES.register(bus)
         BlockEntityTypeInit.BLOCK_ENTITY_TYPES.register(bus)
         CreativeModeTabInit.CREATIVE_MODE_TAB.register(bus)
+        PotionsInit.POTION.register(bus)
+        MobEffectsInit.MOB_EFFECTS.register(bus)
 
         // Register ourselves for server and other game events we are interested in
         // Register the data generators
         bus.addListener(DataGenerators::gatherData)
         // adds recipe category
         bus.addListener(RecipeCategoriesInit::registerRecipeBookCategories)
         // client setup listener
-        bus.addListener(ClientSetup::clientSetup)
+        bus.addListener(ClientEvents::clientSetup)
         // register shield renderer provider
         bus.addListener(ArmourAndToolsModShieldItemRendererProvider::init)
         // register trident renderer provider
         bus.addListener(ArmourAndToolsModTridentItemRendererProvider::init)
         // register entity renderers
-        bus.addListener(ClientSetup::registerEntityRenders)
+        bus.addListener(ClientEvents::registerEntityRenders)
+        // register key input event
+        bus.addListener(ClientEvents::onKeyRegister)
+        FORGE_BUS.addListener(ClientEvents::onKeyInput)
+        // layer render
+        bus.addListener(ClientEvents::registerLayerDefinition)
+        // entity death event
+        FORGE_BUS.addListener(ClientEvents::onEntityDeath)
 
         FORGE_BUS.register(this)