advancements

CHANGELOG

@@ -14,3 +14,15 @@
 - added textures for Gamer Bow
 - added crafting recipe for Gamer Bow
 - fully implemented Gamer Bow
+
+## 1.18.1-1.1.1-unstable
+- fixed weem stacking to 85 (maybe)
+- nerfed high effect
+
+## 1.18.1-1.1.2-unstable
+- added healing back to high effect with lower amplifier
+- changed block strength of all (non joke) blocks
+
+## 1.18.1-1.1.3-unstable (incomplete)
+- added evade enchantment
+- added more advancements

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx4G
 	loader_version=0.12.12
 
 # Mod Properties
-	mod_version = 1.18.1-1.1.0-stable
+	mod_version = 1.18.1-1.1.2-unstable
 	maven_group = ryantlg.GamerItems.mod
 	archives_base_name = GamerItems
 

src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java

@@ -13,9 +13,9 @@ import net.minecraft.util.registry.Registry;
 
 public class jeremiumBlocks {
 
-    public static final Block JEREMIUM_BLOCK = new jeremiumBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool().luminance(16));
-    public static final Block JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5));
-    public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5).sounds(BlockSoundGroup.DEEPSLATE));
+    public static final Block JEREMIUM_BLOCK = new jeremiumBlock(FabricBlockSettings.of(Material.METAL).strength(5.5f, 4.8f).requiresTool().luminance(16));
+    public static final Block JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(6.5f, 8.0f).requiresTool().luminance(5));
+    public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f, 4.2f).requiresTool().luminance(5).sounds(BlockSoundGroup.DEEPSLATE));
 
     public static void register() {
         Registry.register(Registry.BLOCK, new Identifier("gameritems", "jeremium_ore"), JEREMIUM_ORE);

src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java

@@ -11,9 +11,9 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
 public class omniumBlocks {
-    public static final Block OMNIUM_ORE           = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool());
-	public static final Block OMNIUM_BLOCK         = new Block(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool());
-    public static final Block DEEPSLATE_OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
+    public static final Block OMNIUM_ORE           = new Block(FabricBlockSettings.of(Material.STONE).strength(3.5f, 4.0f).requiresTool());
+	public static final Block OMNIUM_BLOCK         = new Block(FabricBlockSettings.of(Material.METAL).strength(5.5f, 7f).requiresTool());
+    public static final Block DEEPSLATE_OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.5f, 3.5f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
 
     public static void register() {
 

src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java

@@ -13,9 +13,9 @@ import net.minecraft.util.Rarity;
 import net.minecraft.util.registry.Registry;
 
 public class oriumBlocks {
-    public static final Block ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool());
-	public static final Block ORIUM_BLOCK = new oriumBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool());
-    public static final Block DEEPSLATE_ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
+    public static final Block ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(3.2f, 3.0f).requiresTool());
+	public static final Block ORIUM_BLOCK = new oriumBlock(FabricBlockSettings.of(Material.METAL).strength(5.0f, 4.0F).requiresTool());
+    public static final Block DEEPSLATE_ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.3f, 3.5f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
 
     public static void register() {
 

src/main/java/net/arcmods/ryantlg/enchantments/evadeEnchantment.java

@@ -0,0 +1,53 @@
+package net.arcmods.ryantlg.enchantments;
+
+import net.arcmods.ryantlg.gameritems;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentTarget;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class evadeEnchantment extends Enchantment {
+
+    public evadeEnchantment() {
+        super(Enchantment.Rarity.UNCOMMON, EnchantmentTarget.ARMOR_CHEST, new EquipmentSlot[] {EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.FEET, EquipmentSlot.LEGS});
+    }
+
+    @Override
+    public int getMinPower(int level) {
+        return 30;
+    }
+    @Override
+    public int getMaxLevel() {
+        return 4;
+    }
+    // public void onTargetDamaged(LivingEntity user, Entity target, int level) {
+    //     if(target instanceof LivingEntity) {
+    //         ((LivingEntity) user).addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20 * 5, level - 1));
+    //     }
+ 
+    //     super.onTargetDamaged(user, target, level);
+    // }
+    @Override
+    public void onUserDamaged(LivingEntity user, Entity attacker, int level) {
+        if (attacker instanceof LivingEntity) {
+            ((LivingEntity) user).addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20 * 7, level));
+            ((LivingEntity) attacker).addStatusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 20 * 5, level));
+        }
+        super.onUserDamaged(user, attacker, level);
+    }
+
+    public static void register() {
+        Registry.register(
+            Registry.ENCHANTMENT,
+            new Identifier("gameritems", "evade"),
+            new evadeEnchantment()
+        );
+        gameritems.LOGGER.info("evadeEnchantment loaded");
+    }
+    
+}

src/main/java/net/arcmods/ryantlg/gameritems.java

@@ -5,6 +5,7 @@ import net.arcmods.ryantlg.blocks.FunnyBlocks;
 import net.arcmods.ryantlg.blocks.jeremiumBlocks;
 import net.arcmods.ryantlg.blocks.omniumBlocks;
 import net.arcmods.ryantlg.blocks.oriumBlocks;
+import net.arcmods.ryantlg.enchantments.evadeEnchantment;
 import net.arcmods.ryantlg.items.armour.jeremiumArmour;
 import net.arcmods.ryantlg.items.armour.notArmour;
 import net.arcmods.ryantlg.items.armour.omniumArmour;
@@ -100,6 +101,8 @@ public class gameritems implements ModInitializer {
 		notArmour.register();
 		gamerBow.register();
 
+		evadeEnchantment.register();
+
 	}
 	//fight me
 	

src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java

@@ -18,7 +18,7 @@ public class weemItems {
 
 //main items
 //================================================================================================================
-    public static final Item WEEM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(128));
+    public static final Item WEEM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(64));
 
 //  foods
 //================================================================================================================

src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java

@@ -2,7 +2,7 @@ package net.arcmods.ryantlg.statusEffects;
 
 import net.arcmods.ryantlg.gameritems;
 import net.arcmods.ryantlg.statusEffects.effectClasses.highStatusEffect;
-import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect;
+//import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
@@ -11,12 +11,12 @@ public class GamerEffects {
 
     public static final StatusEffect HIGH = new highStatusEffect();
 
-    public static final StatusEffect JEREMYD = new jeremydStatusEffect();
+    //public static final StatusEffect JEREMYD = new jeremydStatusEffect();
 
     public static void register() {
         Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "high"), HIGH);
 
-        Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD);
+        //Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD);
 
         gameritems.LOGGER.info("statusEffects Loaded");
     }

src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/highStatusEffect.java

@@ -1,7 +1,7 @@
 package net.arcmods.ryantlg.statusEffects.effectClasses;
 
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.damage.DamageSource;
+//import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.entity.effect.StatusEffectCategory;
 import net.minecraft.entity.player.PlayerEntity;
@@ -22,13 +22,10 @@ public class highStatusEffect extends StatusEffect{
   @Override
   public void applyUpdateEffect(LivingEntity entity, int amplifier) {
     if (entity instanceof PlayerEntity) {
-      ((PlayerEntity) entity).addExperience(0 << amplifier);
       ((PlayerEntity) entity).getFallSounds();
       ((PlayerEntity) entity).disableShield(true);
       ((PlayerEntity) entity).dismountVehicle();
-      ((PlayerEntity) entity).damage(DamageSource.FALL, (float) 0.01);
-      ((PlayerEntity) entity).heal(3 << amplifier);
-      ((PlayerEntity) entity).getFallSounds();
+      ((PlayerEntity) entity).heal(0 << amplifier);
     }
   }
     

src/main/java/net/arcmods/ryantlg/todo.txt

@@ -5,3 +5,4 @@ advancements
 argentine
 geranine
 soulium
+floute

src/main/resources/assets/gameritems/lang/en_us.json

@@ -69,6 +69,7 @@
     "block.gameritems.deepslate_jeremium_ore": "Deepslate Jeremium Ore",
     "block.gameritems.deepslate_omnium_ore": "Deepslate Omnium Ore",
     "block.gameritems.deepslate_orium_ore": "Deepslate Orium Ore",
-    "item.gameritems.gamer_bow": "Gamer Bow"
+    "item.gameritems.gamer_bow": "Gamer Bow",
+    "enchantment.gameritems.evade": "Evade"
 
 } 

src/main/resources/data/gameritems/advancements/jeremium_armour.json

@@ -0,0 +1,43 @@
+{
+    "display": {
+      "icon": {
+        "item": "gameritems:jeremium_helmet"
+      },
+      "title": "coSvered in red",
+      "description": "Get a full set of Jeremium armour",
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true
+    },
+    "parent": "gameritems:raw_jeremium",
+    "criteria": {
+      "requirement": {
+        "trigger": "minecraft:inventory_changed",
+        "conditions": {
+          "items": [
+            {
+              "items": [
+                "gameritems:jeremium_helmet"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:jeremium_chestplate"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:jeremium_leggings"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:jeremium_boots"
+              ]
+            }
+          ]
+        }
+      }
+    }
+  }
+  

src/main/resources/data/gameritems/advancements/omnium_armour.json

@@ -0,0 +1,43 @@
+{
+    "display": {
+      "icon": {
+        "item": "gameritems:omnium_helmet"
+      },
+      "title": "covereD in greEn",
+      "description": "Get a full set of Omnium armour",
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true
+    },
+    "parent": "gameritems:raw_omnium",
+    "criteria": {
+      "requirement": {
+        "trigger": "minecraft:inventory_changed",
+        "conditions": {
+          "items": [
+            {
+              "items": [
+                "gameritems:omnium_helmet"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:omnium_chestplate"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:omnium_leggings"
+              ]
+            },
+            {
+              "items": [
+                "gameritems:omnium_boots"
+              ]
+            }
+          ]
+        }
+      }
+    }
+  }
+  

src/main/resources/data/gameritems/advancements/orium_armour.json

@@ -0,0 +1,42 @@
+{
+  "display": {
+    "icon": {
+      "item": "gameritems:orium_helmet"
+    },
+    "title": "covered iN blUe",
+    "description": "Get a full set of Orium armour",
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true
+  },
+  "parent": "gameritems:raw_orium",
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "gameritems:orium_helmet"
+            ]
+          },
+          {
+            "items": [
+              "gameritems:orium_chestplate"
+            ]
+          },
+          {
+            "items": [
+              "gameritems:orium_leggings"
+            ]
+          },
+          {
+            "items": [
+              "gameritems:orium_boots"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}

src/main/resources/data/gameritems/advancements/raw_jeremium.json

@@ -0,0 +1,27 @@
+{
+  "display": {
+    "icon": {
+      "item": "gameritems:raw_jeremium"
+    },
+    "title": "reD?",
+    "description": "Get a piece of raw Jeremium",
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true
+  },
+  "parent": "gameritems:omnium_armour",
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "gameritems:raw_jeremium"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}

src/main/resources/data/gameritems/advancements/raw_omnium.json

@@ -9,7 +9,7 @@
     "show_toast": true,
     "announce_to_chat": true
   },
-    "parent": "gameritems:gameritems",
+  "parent": "gameritems:orium_armour",
   "criteria": {
     "requirement": {
       "trigger": "minecraft:inventory_changed",

src/main/resources/data/gameritems/advancements/raw_orium.json

@@ -0,0 +1,27 @@
+{
+  "display": {
+    "icon": {
+      "item": "gameritems:raw_orium"
+    },
+    "title": "blueS?",
+    "description": "Get a piece of raw Orium",
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true
+  },
+  "parent": "gameritems:gameritems",
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "gameritems:raw_orium"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}