Nerfed turquoise spawnrate, added smithing templates to loottables, f…

…ixed armor effects being infinite when armor is taken off, fixed recipes not working, added meme sounds

build.gradle

@@ -29,6 +29,9 @@ repositories {
 	maven {
 		url = "https://api.modrinth.com/maven"
 	}
+	maven {
+		url = "https://cursemaven.com"
+	}
 	maven {
 		name = 'ParchmentMC'
 		url = 'https://maven.parchmentmc.org'
@@ -89,6 +92,9 @@ dependencies {
 	include 'net.kyrptonaught:customportalapi:0.0.1-beta64-1.20'
 
 	modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
+
+	//XRay
+	modImplementation "curse.maven:advanced-xray-fabric-edition-444663:4595168"
 }
 
 processResources {

src/main/java/mod/leronus/mores/item/custom/ModArmorItem.java

@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableMap;
 import mod.leronus.mores.item.ModArmorMaterials;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.entity.player.PlayerEntity;
@@ -16,30 +17,30 @@
 public class ModArmorItem extends ArmorItem {
     private static final Map<ArmorMaterial, StatusEffectInstance> MATERIAL_TO_EFFECT_MAP =
             (new ImmutableMap.Builder<ArmorMaterial, StatusEffectInstance>())
-                    .put(ModArmorMaterials.TIN, new StatusEffectInstance(StatusEffects.JUMP_BOOST, -1, 1,
-                            false, false, true))
-                    .put(ModArmorMaterials.COBALT, new StatusEffectInstance(StatusEffects.HASTE, -1, 0,
-                            false, false, true))
-                    .put(ModArmorMaterials.STEEL, new StatusEffectInstance(StatusEffects.STRENGTH, -1, 0,
-                            false, false, true))
-                    .put(ModArmorMaterials.AMETHYST, new StatusEffectInstance(StatusEffects.SLOW_FALLING, -1, 0,
-                            false, false, true))
-                    .put(ModArmorMaterials.EMERALD, new StatusEffectInstance(StatusEffects.LUCK, -1, 0,
-                            false, false, true))
-                    .put(ModArmorMaterials.TOPAZ, new StatusEffectInstance(StatusEffects.HASTE, -1, 1,
-                            false, false, true))
-                    .put(ModArmorMaterials.TOURMALINE, new StatusEffectInstance(StatusEffects.REGENERATION, -1, 0,
-                            false, false, true))
-                    .put(ModArmorMaterials.TANZANITE, new StatusEffectInstance(StatusEffects.SPEED, -1, 0,
-                            false, false, true))
-                    .put(ModArmorMaterials.RUBY, new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, -1, 0,
-                            false, false, true))
-                    .put(ModArmorMaterials.SAPPHIRE, new StatusEffectInstance(StatusEffects.NIGHT_VISION, -1, 0,
-                            false, false, true))
-                    .put(ModArmorMaterials.MOISSANITE, new StatusEffectInstance(StatusEffects.CONDUIT_POWER, -1, 0,
-                            false, false, true))
-                    .put(ModArmorMaterials.TURQUOISE, new StatusEffectInstance(StatusEffects.DOLPHINS_GRACE, -1, 0,
-                            false, false, true))
+                    .put(ModArmorMaterials.TIN, new StatusEffectInstance(StatusEffects.JUMP_BOOST, 10, 1,
+                            false, true, false))
+                    .put(ModArmorMaterials.COBALT, new StatusEffectInstance(StatusEffects.HASTE, 10, 0,
+                            false, true, false))
+                    .put(ModArmorMaterials.STEEL, new StatusEffectInstance(StatusEffects.STRENGTH, 10, 0,
+                            false, true, false))
+                    .put(ModArmorMaterials.AMETHYST, new StatusEffectInstance(StatusEffects.SLOW_FALLING, 10, 0,
+                            false, true, false))
+                    .put(ModArmorMaterials.EMERALD, new StatusEffectInstance(StatusEffects.LUCK, 10, 0,
+                            false, true, false))
+                    .put(ModArmorMaterials.TOPAZ, new StatusEffectInstance(StatusEffects.HASTE, 10, 1,
+                            false, true, false))
+                    .put(ModArmorMaterials.TOURMALINE, new StatusEffectInstance(StatusEffects.REGENERATION, 10, 0,
+                            false, true, false))
+                    .put(ModArmorMaterials.TANZANITE, new StatusEffectInstance(StatusEffects.SPEED, 10, 0,
+                            false, true, false))
+                    .put(ModArmorMaterials.RUBY, new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 10, 0,
+                            false, true, false))
+                    .put(ModArmorMaterials.SAPPHIRE, new StatusEffectInstance(StatusEffects.NIGHT_VISION, 250, 0,
+                            false, true, false))
+                    .put(ModArmorMaterials.MOISSANITE, new StatusEffectInstance(StatusEffects.CONDUIT_POWER, 10, 0,
+                            false, true, false))
+                    .put(ModArmorMaterials.TURQUOISE, new StatusEffectInstance(StatusEffects.DOLPHINS_GRACE, 10, 0,
+                            false, true, false))
                     .build();
 
     public ModArmorItem(ArmorMaterial material, Type type, Settings settings) {
@@ -70,10 +71,14 @@ private void evaluateArmorEffects(PlayerEntity player) {
 
     private void addStatusEffectForMaterial(PlayerEntity player, ArmorMaterial mapArmorMaterial, StatusEffectInstance mapStatusEffect) {
         boolean hasPlayerEffect = player.hasStatusEffect(mapStatusEffect.getEffectType());
-
+        StatusEffect playerEffect = mapStatusEffect.getEffectType();
         if(hasCorrectArmorOn(mapArmorMaterial, player) && !hasPlayerEffect) {
             player.addStatusEffect(new StatusEffectInstance(mapStatusEffect));
         }
+        if (hasCorrectArmorOn(mapArmorMaterial, player) && playerEffect == StatusEffects.NIGHT_VISION){
+            player.setStatusEffect(new StatusEffectInstance(StatusEffects.NIGHT_VISION, 250, 0,
+                    false, true, false), null);
+        }
     }
 
     private boolean hasFullSuitOfArmorOn(PlayerEntity player) {

src/main/java/mod/leronus/mores/sound/ModSounds.java

@@ -9,6 +9,8 @@
 public class ModSounds {
     public static final SoundEvent SWEET_CAROLINE_BOOTLEG = registerSoundEvent("sweet_caroline_bootleg");
     public static final SoundEvent CIPHER = registerSoundEvent( "cipher");
+    public static final SoundEvent WORTEL9 = registerSoundEvent( "wortel9");
+    public static final SoundEvent WATWAAROM = registerSoundEvent( "watwaarom");
 
     private static SoundEvent registerSoundEvent(String name) {
         Identifier id = new Identifier(Mores.MOD_ID, name);

src/main/java/mod/leronus/mores/world/ModConfiguredFeatures.java

@@ -155,9 +155,9 @@ public static void bootstrap(Registerable<ConfiguredFeature<?, ?>> context) {
         register(context, SAPPHIRE_BURIED_ORE_KEY, Feature.ORE, new OreFeatureConfig(OVERWORLD_SAPPHIRE_ORES,8, 1.0F));
         register(context, NETHER_SAPPHIRE_ORE_KEY, Feature.ORE, new OreFeatureConfig(NETHER_SAPPHIRE_ORES,5, 0.7F));
 
-        register(context, TURQUOISE_SMALL_ORE_KEY, Feature.ORE, new OreFeatureConfig(OVERWORLD_TURQUOISE_ORES,4, 0.5F));
-        register(context, TURQUOISE_LARGE_ORE_KEY, Feature.ORE, new OreFeatureConfig(OVERWORLD_TURQUOISE_ORES,10, 0.7F));
-        register(context, TURQUOISE_BURIED_ORE_KEY, Feature.ORE, new OreFeatureConfig(OVERWORLD_TURQUOISE_ORES,8, 1.0F));
+        register(context, TURQUOISE_SMALL_ORE_KEY, Feature.ORE, new OreFeatureConfig(OVERWORLD_TURQUOISE_ORES,6, 0.5F));
+        register(context, TURQUOISE_LARGE_ORE_KEY, Feature.ORE, new OreFeatureConfig(OVERWORLD_TURQUOISE_ORES,7, 0.7F));
+        register(context, TURQUOISE_BURIED_ORE_KEY, Feature.ORE, new OreFeatureConfig(OVERWORLD_TURQUOISE_ORES,6, 1.0F));
 
         register(context, END_ONYX_ORE_KEY, Feature.ORE, new OreFeatureConfig(END_ONYX_ORES,6));
 

src/main/resources/assets/mores/models/item/cipher_music_disc.json

@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures":
+  {
+    "layer0": "mores:item/cipher_music_disc"
+  }
+}

src/main/resources/assets/mores/models/item/sweet_caroline_music_disc.json

@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures":
+  {
+    "layer0": "mores:item/sweet_caroline_music_disc"
+  }
+}

src/main/resources/assets/mores/sounds.json

@@ -16,5 +16,23 @@
         "stream" : true
       }
     ]
+  },
+  "wortel9": {
+    "subtitle" : "sound.mores.wortel9",
+    "sounds" : [
+      {
+        "name" : "mores:wortel9",
+        "stream" : true
+      }
+    ]
+  },
+  "watwaarom": {
+    "subtitle" : "sound.mores.watwaarom",
+    "sounds" : [
+      {
+        "name" : "mores:watwaarom",
+        "stream" : true
+      }
+    ]
   }
 }

src/main/resources/data/forge/tags/items/gems/graphene.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:graphene_gem"
+  ]
+}

src/main/resources/data/forge/tags/items/gems/moissanite.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:moissanite_gem"
+  ]
+}

src/main/resources/data/forge/tags/items/gems/onyx.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:onyx_gem"
+  ]
+}

src/main/resources/data/forge/tags/items/gems/ruby.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:ruby_gem"
+  ]
+}

src/main/resources/data/forge/tags/items/gems/sapphire.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:sapphire_gem"
+  ]
+}

src/main/resources/data/forge/tags/items/gems/tanzanite.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:tanzanite_gem"
+  ]
+}

src/main/resources/data/forge/tags/items/gems/topaz.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:topaz_gem"
+  ]
+}

src/main/resources/data/forge/tags/items/gems/tourmaline.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:tourmaline_gem"
+  ]
+}

src/main/resources/data/forge/tags/items/gems/turquoise.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:turquoise_gem"
+  ]
+}

src/main/resources/data/forge/tags/items/ingots/bronze.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:bronze_ingot"
+  ]
+}

src/main/resources/data/forge/tags/items/ingots/cobalt.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:cobalt_ingot"
+  ]
+}

src/main/resources/data/forge/tags/items/ingots/obsidian.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:obsidian_ingot"
+  ]
+}

src/main/resources/data/forge/tags/items/ingots/silver.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:silver_ingot"
+  ]
+}

src/main/resources/data/forge/tags/items/ingots/steel.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:steel_ingot"
+  ]
+}

src/main/resources/data/forge/tags/items/ingots/sterling_silver.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:sterling_ingot"
+  ]
+}

src/main/resources/data/forge/tags/items/ingots/tin.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:tin_ingot"
+  ]
+}

src/main/resources/data/forge/tags/items/nuggets/bronze.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:bronze_nugget"
+  ]
+}

src/main/resources/data/forge/tags/items/nuggets/cobalt.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:cobalt_nugget"
+  ]
+}

src/main/resources/data/forge/tags/items/nuggets/copper.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:copper_nugget"
+  ]
+}

src/main/resources/data/forge/tags/items/nuggets/silver.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:silver_nugget"
+  ]
+}

src/main/resources/data/forge/tags/items/nuggets/steel.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:steel_nugget"
+  ]
+}

src/main/resources/data/forge/tags/items/nuggets/sterling_silver.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:sterling_nugget"
+  ]
+}

src/main/resources/data/forge/tags/items/nuggets/tin.json

@@ -0,0 +1,6 @@
+{
+  "replace": "false",
+  "values": [
+    "mores:tin_nugget"
+  ]
+}

src/main/resources/data/mores/advancements/craft_full_obsidian_armor.json

@@ -41,6 +41,9 @@
     }
   },
   "rewards": {
+    "loot": [
+      "mores:graphene_alloy_smithing_template"
+    ],
     "experience": 150
   }
 }

src/main/resources/data/mores/functions/mores/play_wortel9.mcfunction

@@ -0,0 +1 @@
+playsound mores:wortel9 ambient @a

src/main/resources/data/mores/loot_tables/graphene_alloy_smithing_template.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:advancement_reward",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "mores:graphene_alloy_smithing_template"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/mores/loot_tables/steel_alloy_smithing_template.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "mores:sterling_alloy_smithing_template"
+          "name": "mores:steel_alloy_smithing_template"
         }
       ]
     }