Merge pull request #107 from AnonymousHacker1279/1.20.1-dev

Update master branch with 1.20.1-dev changes

RELEASE_NOTES.md

@@ -1,45 +1,19 @@
-This major update reworks ammunition crafting and tweaks firearms. As usual, there is a handful of other new features.
+This minor update includes a batch of bugfixes and improvements.
 
 ### Feature Changes / Additions
 
-- Rework ammunition crafting
-	- Added a new Ammunition Table, which is used to craft musket balls
-	- Materials are added into the table (ingots, nuggets, shards, etc.), and the table will calculate the amount of
-	  ammunition that can be crafted from the inputs
-	- The table provides a "Density" modifier, which allows ammunition to be weighted at the cost of more materials
-		- Higher density ammunition will deal more damage, but will not travel as far
-- Implement powder system
-	- Firearms now require a form of powder to be used. Either gunpowder, blackpowder, or sulfur dust can be used
-		- Potassium Nitrate ore has been added, the drops of which can be used to craft gunpowder or blackpowder
-		- The quality of powders, from best to worst, is gunpowder, blackpowder, and sulfur dust
-			- Powder quality affects the following:
-				- Fire velocity
-				- Firearm damage taken
-				- Smoke produced
-				- Chance to consume powder
-- Firearms are now affected by the environment
-	- When underwater, there is a 90% misfire chance and bullet velocity is reduced by 50%
-	- When raining, bullet velocity is reduced by 30%
-	- When in powdered snow, bullet velocity is reduced by 20%
-	- These effects can be partially mitigated by equipping the Powder Horn accessory
-- Increased generation rate of sulfur ore in the overworld
-- Added a shift tooltip to bullet-like items, exposing some of the hidden stats
-- Added three new bows
-	- Ice Bow - arrows slow targets on impact
-	- Dragon's Breath Bow - arrows explode on impact
-	- Aurora Bow - arrows experience 4x less gravity
-- Added knockback resistance to Super Hans
+- Adjusted generation weights of biomes in Tiltros, to make Tiltros Wastes less rare
+- Add protection-like enchantments to the Skygazer max level configuration (at level 5)
+- Add ores tag for sulfur
+- Add blood sand to the `smelts_to_glass` block and item tags
+- Update translation keys for enchantment numbers up to 100
 
 ### Bugfixes
 
-- Fix Minutemen spawned from statues not having weapons
-- Add missing endgame ingots to the `ingots.json` tag
-- Update death message translations to address some missing cases and fix some existing ones not displaying as expected
-- Fix quick stacking out of Tesla Synthesizer slots
-- Fix item stacks getting empty tags out of
-  nowhere ([Fixes #105](https://github.com/AnonymousHacker1279/ImmersiveWeapons/issues/105))
-- Fix Velocity enchantment not being applicable to crossbows
-
-### Other Improvements
-
-- Massive cleanups to projectile-related classes, significantly reducing code duplication across similar projectiles
+- Fix 3rd person models for custom bows not using the proper parent model
+- Fix custom bows not changing player FOV when drawing
+- Fix Lava Revenants getting stuck when flying into water
+- Fix Evil Eyes not dropping XP
+- Add missing flare tooltip
+- Fix barbed wire fences dealing no damage
+- Fix spotlights leaving behind light blocks when the block they are attached to is broken

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx6G
 org.gradle.daemon=true
 org.gradle.caching=true
 org.gradle.parallel=true
-mod_version=1.20.1-1.27.0
+mod_version=1.20.1-1.27.1
 mod_group_id=tech.anonymoushacker1279.immersiveweapons
 mappings_channel=parchment
 mappings_version=2023.09.03-1.20.1
@@ -12,7 +12,7 @@ neoforge_version=47.1.79
 neoforge_version_range=[47.1.3,)
 loader_version_range=[47,)
 terrablender_version=1.20-3.0.0.163
-iwcb_version=1.20.1-1.6.0
+iwcb_version=1.20.1-1.7.0
 jei_version=15.2.0.27
 wthit_version=8.4.0
 badpackets_version=0.4.1

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

@@ -507,6 +507,7 @@
   "enchantment.immersiveweapons.scorch_shot": "Scorch Shot",
   "enchantment.immersiveweapons.sharpened_head": "Sharpened Head",
   "enchantment.immersiveweapons.velocity": "Velocity",
+  "enchantment.level.100": "C",
   "enchantment.level.11": "XI",
   "enchantment.level.12": "XII",
   "enchantment.level.13": "XIII",
@@ -522,6 +523,80 @@
   "enchantment.level.23": "XXIII",
   "enchantment.level.24": "XXIV",
   "enchantment.level.25": "XXV",
+  "enchantment.level.26": "XXVI",
+  "enchantment.level.27": "XXVII",
+  "enchantment.level.28": "XXVIII",
+  "enchantment.level.29": "XXIX",
+  "enchantment.level.30": "XXX",
+  "enchantment.level.31": "XXXI",
+  "enchantment.level.32": "XXXII",
+  "enchantment.level.33": "XXXIII",
+  "enchantment.level.34": "XXXIV",
+  "enchantment.level.35": "XXXV",
+  "enchantment.level.36": "XXXVI",
+  "enchantment.level.37": "XXXVII",
+  "enchantment.level.38": "XXXVIII",
+  "enchantment.level.39": "XXXIX",
+  "enchantment.level.40": "XL",
+  "enchantment.level.41": "XLI",
+  "enchantment.level.42": "XLII",
+  "enchantment.level.43": "XLIII",
+  "enchantment.level.44": "XLIV",
+  "enchantment.level.45": "XLV",
+  "enchantment.level.46": "XLVI",
+  "enchantment.level.47": "XLVII",
+  "enchantment.level.48": "XLVIII",
+  "enchantment.level.49": "XLIX",
+  "enchantment.level.50": "L",
+  "enchantment.level.51": "LI",
+  "enchantment.level.52": "LII",
+  "enchantment.level.53": "LIII",
+  "enchantment.level.54": "LIV",
+  "enchantment.level.55": "LV",
+  "enchantment.level.56": "LVI",
+  "enchantment.level.57": "LVII",
+  "enchantment.level.58": "LVIII",
+  "enchantment.level.59": "LIX",
+  "enchantment.level.60": "LX",
+  "enchantment.level.61": "LXI",
+  "enchantment.level.62": "LXII",
+  "enchantment.level.63": "LXIII",
+  "enchantment.level.64": "LXIV",
+  "enchantment.level.65": "LXV",
+  "enchantment.level.66": "LXVI",
+  "enchantment.level.67": "LXVII",
+  "enchantment.level.68": "LXVIII",
+  "enchantment.level.69": "LXIX",
+  "enchantment.level.70": "LXX",
+  "enchantment.level.71": "LXXI",
+  "enchantment.level.72": "LXXII",
+  "enchantment.level.73": "LXXIII",
+  "enchantment.level.74": "LXXIV",
+  "enchantment.level.75": "LXXV",
+  "enchantment.level.76": "LXXVI",
+  "enchantment.level.77": "LXXVII",
+  "enchantment.level.78": "LXXVIII",
+  "enchantment.level.79": "LXXIX",
+  "enchantment.level.80": "LXXX",
+  "enchantment.level.81": "LXXXI",
+  "enchantment.level.82": "LXXXII",
+  "enchantment.level.83": "LXXXIII",
+  "enchantment.level.84": "LXXXIV",
+  "enchantment.level.85": "LXXXV",
+  "enchantment.level.86": "LXXXVI",
+  "enchantment.level.87": "LXXXVII",
+  "enchantment.level.88": "LXXXVIII",
+  "enchantment.level.89": "LXXXIX",
+  "enchantment.level.90": "XC",
+  "enchantment.level.91": "XCI",
+  "enchantment.level.92": "XCII",
+  "enchantment.level.93": "XCIII",
+  "enchantment.level.94": "XCIV",
+  "enchantment.level.95": "XCV",
+  "enchantment.level.96": "XCVI",
+  "enchantment.level.97": "XCVII",
+  "enchantment.level.98": "XCVIII",
+  "enchantment.level.99": "XCIX",
   "entity.immersiveweapons.astral_arrow": "Astral Arrow",
   "entity.immersiveweapons.astral_musket_ball": "Astral Musket Ball",
   "entity.immersiveweapons.burned_oak_boat": "Burned Oak Boat",
@@ -1056,6 +1131,7 @@
   "tooltip.immersiveweapons.emerald_ring": "Provides the Hero of the Village effect",
   "tooltip.immersiveweapons.explosive_cannonball": "Similar to the cannonball but explodes on impact.",
   "tooltip.immersiveweapons.first_aid_kit": "An effective method of healing, combining the effects of bandages and painkillers",
+  "tooltip.immersiveweapons.flare": "Brightly illuminates the area around it.",
   "tooltip.immersiveweapons.flare_gun": "Launch bright flares into the sky",
   "tooltip.immersiveweapons.flintlock_pistol": "A basic flintlock firearm that excels in medium-range combat.",
   "tooltip.immersiveweapons.gauntlet": "Beat the life out of your opponents.",

src/generated/resources/assets/immersiveweapons/models/item/aurora_bow_pulling_0.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "immersiveweapons:item/aurora_bow",
   "textures": {
     "layer0": "immersiveweapons:item/aurora_bow_pulling_0"
   }

src/generated/resources/assets/immersiveweapons/models/item/aurora_bow_pulling_1.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "immersiveweapons:item/aurora_bow",
   "textures": {
     "layer0": "immersiveweapons:item/aurora_bow_pulling_1"
   }

src/generated/resources/assets/immersiveweapons/models/item/aurora_bow_pulling_2.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "immersiveweapons:item/aurora_bow",
   "textures": {
     "layer0": "immersiveweapons:item/aurora_bow_pulling_2"
   }

src/generated/resources/assets/immersiveweapons/models/item/dragons_breath_bow_pulling_0.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "immersiveweapons:item/dragons_breath_bow",
   "textures": {
     "layer0": "immersiveweapons:item/dragons_breath_bow_pulling_0"
   }

src/generated/resources/assets/immersiveweapons/models/item/dragons_breath_bow_pulling_1.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "immersiveweapons:item/dragons_breath_bow",
   "textures": {
     "layer0": "immersiveweapons:item/dragons_breath_bow_pulling_1"
   }

src/generated/resources/assets/immersiveweapons/models/item/dragons_breath_bow_pulling_2.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "immersiveweapons:item/dragons_breath_bow",
   "textures": {
     "layer0": "immersiveweapons:item/dragons_breath_bow_pulling_2"
   }

src/generated/resources/assets/immersiveweapons/models/item/ice_bow_pulling_0.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "immersiveweapons:item/ice_bow",
   "textures": {
     "layer0": "immersiveweapons:item/ice_bow_pulling_0"
   }

src/generated/resources/assets/immersiveweapons/models/item/ice_bow_pulling_1.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "immersiveweapons:item/ice_bow",
   "textures": {
     "layer0": "immersiveweapons:item/ice_bow_pulling_1"
   }

src/generated/resources/assets/immersiveweapons/models/item/ice_bow_pulling_2.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "immersiveweapons:item/ice_bow",
   "textures": {
     "layer0": "immersiveweapons:item/ice_bow_pulling_2"
   }

src/generated/resources/data/forge/tags/blocks/ores.json

@@ -1,5 +1,6 @@
 {
   "values": [
-    "#forge:ores/cobalt"
+    "#forge:ores/cobalt",
+    "#forge:ores/sulfur"
   ]
 }

src/generated/resources/data/forge/tags/blocks/ores/sulfur.json

@@ -0,0 +1,7 @@
+{
+  "values": [
+    "immersiveweapons:sulfur_ore",
+    "immersiveweapons:deepslate_sulfur_ore",
+    "immersiveweapons:nether_sulfur_ore"
+  ]
+}

src/generated/resources/data/forge/tags/items/ores.json

@@ -1,5 +1,6 @@
 {
   "values": [
-    "#forge:ores/cobalt"
+    "#forge:ores/cobalt",
+    "#forge:ores/sulfur"
   ]
 }

src/generated/resources/data/forge/tags/items/ores/sulfur.json

@@ -0,0 +1,7 @@
+{
+  "values": [
+    "immersiveweapons:sulfur_ore",
+    "immersiveweapons:deepslate_sulfur_ore",
+    "immersiveweapons:nether_sulfur_ore"
+  ]
+}

src/generated/resources/data/immersiveweapons/worldgen/biome/deadmans_desert.json

@@ -125,5 +125,5 @@
     "water_ambient": [],
     "water_creature": []
   },
-  "temperature": 1.8
+  "temperature": 0.2
 }

src/generated/resources/data/immersiveweapons/worldgen/biome/starlight_plains.json

@@ -113,5 +113,5 @@
     "water_ambient": [],
     "water_creature": []
   },
-  "temperature": 0.8
+  "temperature": 0.6
 }

src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json

@@ -0,0 +1,9 @@
+{
+  "values": [
+    "immersiveweapons:cobalt_block",
+    "immersiveweapons:molten_block",
+    "immersiveweapons:tesla_block",
+    "immersiveweapons:astral_block",
+    "immersiveweapons:starstorm_block"
+  ]
+}

src/generated/resources/data/minecraft/tags/blocks/smelts_to_glass.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "immersiveweapons:blood_sand"
+  ]
+}

src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json

@@ -0,0 +1,10 @@
+{
+  "values": [
+    "immersiveweapons:cobalt_ingot",
+    "immersiveweapons:molten_ingot",
+    "immersiveweapons:tesla_ingot",
+    "immersiveweapons:ventus_shard",
+    "immersiveweapons:astral_ingot",
+    "immersiveweapons:starstorm_ingot"
+  ]
+}

src/generated/resources/data/minecraft/tags/items/smelts_to_glass.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "immersiveweapons:blood_sand"
+  ]
+}