Merge pull request #108 from AnonymousHacker1279/1.20.1-dev

Update master branch with 1.20.1-dev changes

RELEASE_NOTES.md

@@ -1,19 +1,11 @@
-This minor update includes a batch of bugfixes and improvements.
+This minor update includes three major bugfixes.
 
 ### Feature Changes / Additions
 
-- 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
+- Add Swift Sneak to the Skygazer max level configuration (at level 5)
 
 ### Bugfixes
 
-- 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
+- Fix molten tool recipes not using the proper template item
+- Fix duplication bug in the Ammunition Table when shift-clicking
+- Fix ammo being dropped when the Ammunition Table is broken, without consuming the materials

build.gradle

@@ -87,8 +87,6 @@ minecraft {
 
 		data {
 			args '--mod', 'immersiveweapons', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
-			jvmArgs '-Xmx4G', '-XX:+AllowEnhancedClassRedefinition'
 		}
 	}
 }

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.1
+mod_version=1.20.1-1.27.2
 mod_group_id=tech.anonymoushacker1279.immersiveweapons
 mappings_channel=parchment
 mappings_version=2023.09.03-1.20.1

src/generated/resources/data/immersiveweapons/recipes/molten_axe_smithing.json

@@ -10,6 +10,6 @@
     "item": "immersiveweapons:molten_axe"
   },
   "template": {
-    "item": "immersiveweapons:molten_musket_ball"
+    "item": "immersiveweapons:molten_smithing_template"
   }
 }

src/generated/resources/data/immersiveweapons/recipes/molten_gauntlet_smithing.json

@@ -10,6 +10,6 @@
     "item": "immersiveweapons:molten_gauntlet"
   },
   "template": {
-    "item": "immersiveweapons:molten_musket_ball"
+    "item": "immersiveweapons:molten_smithing_template"
   }
 }

src/generated/resources/data/immersiveweapons/recipes/molten_hoe_smithing.json

@@ -10,6 +10,6 @@
     "item": "immersiveweapons:molten_hoe"
   },
   "template": {
-    "item": "immersiveweapons:molten_musket_ball"
+    "item": "immersiveweapons:molten_smithing_template"
   }
 }

src/generated/resources/data/immersiveweapons/recipes/molten_pickaxe_smithing.json

@@ -10,6 +10,6 @@
     "item": "immersiveweapons:molten_pickaxe"
   },
   "template": {
-    "item": "immersiveweapons:molten_musket_ball"
+    "item": "immersiveweapons:molten_smithing_template"
   }
 }

src/generated/resources/data/immersiveweapons/recipes/molten_pike_smithing.json

@@ -10,6 +10,6 @@
     "item": "immersiveweapons:molten_pike"
   },
   "template": {
-    "item": "immersiveweapons:molten_musket_ball"
+    "item": "immersiveweapons:molten_smithing_template"
   }
 }

src/generated/resources/data/immersiveweapons/recipes/molten_shovel_smithing.json

@@ -10,6 +10,6 @@
     "item": "immersiveweapons:molten_shovel"
   },
   "template": {
-    "item": "immersiveweapons:molten_musket_ball"
+    "item": "immersiveweapons:molten_smithing_template"
   }
 }

src/generated/resources/data/immersiveweapons/recipes/molten_sword_smithing.json

@@ -10,6 +10,6 @@
     "item": "immersiveweapons:molten_sword"
   },
   "template": {
-    "item": "immersiveweapons:molten_musket_ball"
+    "item": "immersiveweapons:molten_smithing_template"
   }
 }

src/main/java/tech/anonymoushacker1279/immersiveweapons/block/crafting/AmmunitionTableBlock.java

@@ -92,8 +92,8 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player
 	public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving) {
 		if (!state.is(newState.getBlock())) {
 			if (level.getBlockEntity(pos) instanceof AmmunitionTableBlockEntity blockEntity) {
+				blockEntity.removeItemNoUpdate(6);  // Remove the output item
 				Containers.dropContents(level, pos, blockEntity);
-				level.updateNeighbourForOutputSignal(pos, this);
 			}
 
 			super.onRemove(state, level, pos, newState, isMoving);

src/main/java/tech/anonymoushacker1279/immersiveweapons/blockentity/AmmunitionTableBlockEntity.java

@@ -216,7 +216,7 @@ public void setChanged() {
 	 * A higher density modifier increases the amount of resources required. Each input item has its own density.
 	 */
 	private void calculateOutput() {
-		if (level == null) {
+		if (level == null || remove) {
 			return;
 		}
 

src/main/java/tech/anonymoushacker1279/immersiveweapons/config/CommonConfig.java

@@ -208,7 +208,7 @@ public static CommonConfig create(ForgeConfigSpec.Builder builder) {
 
 	@NotNull
 	private static Map<Object, Object> getEnchantCapsMap() {
-		Map<Object, Object> enchantCaps = new HashMap<>(20);
+		Map<Object, Object> enchantCaps = new HashMap<>(40);
 		enchantCaps.put("minecraft:mending", 1);
 		enchantCaps.put("minecraft:silk_touch", 1);
 		enchantCaps.put("minecraft:knockback", 5);
@@ -222,6 +222,7 @@ private static Map<Object, Object> getEnchantCapsMap() {
 		enchantCaps.put("minecraft:fire_protection", 5);
 		enchantCaps.put("minecraft:projectile_protection", 5);
 		enchantCaps.put("minecraft:feather_falling", 5);
+		enchantCaps.put("minecraft:swift_sneak", 5);
 		enchantCaps.put("immersiveweapons:extended_reach", 1);
 		enchantCaps.put("immersiveweapons:endless_musket_pouch", 1);
 		enchantCaps.put("immersiveweapons:scorch_shot", 3);

src/main/java/tech/anonymoushacker1279/immersiveweapons/data/recipes/families/ToolFamilies.java

@@ -80,7 +80,7 @@ public record ToolFamilies(TagKey<Item> material,
 			ItemRegistry.MOLTEN_PIKE,
 			null,
 			ItemRegistry.MOLTEN_ARROW,
-			ItemRegistry.MOLTEN_MUSKET_BALL,
+			ItemRegistry.MOLTEN_SMITHING_TEMPLATE,
 			NETHERITE_TOOLS
 	);
 

src/main/java/tech/anonymoushacker1279/immersiveweapons/menu/AmmunitionTableMenu.java

@@ -34,7 +34,7 @@ public AmmunitionTableMenu(int containerID, Inventory inventory, Container conta
 		super(MenuTypeRegistry.AMMUNITION_TABLE_MENU.get(), containerID);
 		this.container = container;
 		this.containerData = containerData;
-		
+
 		// Ammunition table inventory slots (first begins at (8, 19), it is a 3x2 grid)
 		for (int i = 0; i < 2; ++i) {
 			for (int j = 0; j < 3; ++j) {
@@ -96,6 +96,8 @@ public ItemStack quickMoveStack(Player player, int index) {
 			} else {
 				slot.setChanged();
 			}
+
+			slot.onTake(player, oldStack);
 		}
 
 		return itemStack;

src/main/resources/assets/immersiveweapons/models/block/ammunition_table.json

@@ -164,18 +164,6 @@
 				"south": {"uv": [10.66667, 9, 14.66667, 10], "texture": "#6", "cullface": "south"}
 			}
 		},
-		{
-			"name": "ammo pile cloth",
-			"from": [8, 12, 3],
-			"to": [15, 12.001, 11],
-			"faces": {
-				"north": {"uv": [10.66667, 0, 13, 0.03125], "texture": "#6"},
-				"east": {"uv": [10.66667, 0, 13.33333, 0.03125], "texture": "#6"},
-				"south": {"uv": [10.66667, 0, 13, 0.03125], "texture": "#6"},
-				"west": {"uv": [10.66667, 0, 13.33333, 0.03125], "texture": "#6"},
-				"up": {"uv": [10.66667, 0, 13, 4], "texture": "#6"}
-			}
-		},
 		{
 			"name": "rail",
 			"from": [0, 12, 0],
@@ -341,24 +329,23 @@
 			"children": [
 				13,
 				14,
-				15,
 				{
 					"name": "powder bottle",
 					"origin": [8, 8, 8],
 					"color": 0,
-					"children": [16, 17]
+					"children": [15, 16]
 				},
 				{
 					"name": "powder bottle",
 					"origin": [8, 8, 8],
 					"color": 0,
-					"children": [18, 19]
+					"children": [17, 18]
 				},
 				{
 					"name": "material container",
 					"origin": [8, 8, 8],
 					"color": 0,
-					"children": [20, 21, 22, 23]
+					"children": [19, 20, 21, 22]
 				}
 			]
 		}

update.json

@@ -1,8 +1,8 @@
 {
 	"homepage": "https://www.curseforge.com/minecraft/mc-mods/immersive-weapons",
 	"promos": {
-		"1.20.1-latest": "1.20.1-1.27.1",
-		"1.20.1-recommended": "1.20.1-1.27.1",
+		"1.20.1-latest": "1.20.1-1.27.2",
+		"1.20.1-recommended": "1.20.1-1.27.2",
 		"1.19.4-latest": "1.19.4-1.23.2",
 		"1.19.4-recommended": "1.19.4-1.23.2",
 		"1.19.3-latest": "1.19.3-1.21.0",
@@ -23,6 +23,7 @@
 		"1.16.4-recommended": "1.16.5-1.1.1"
 	},
 	"1.20.1": {
+		"1.20.1-1.27.2": "Bugfixes - https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.27.2",
 		"1.20.1-1.27.1": "Bugfixes and improvements - https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.27.1",
 		"1.20.1-1.27.0": "Features, improvements, bugfixes - https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.27.0",
 		"1.20.1-1.26.2": "Bugfixes and improvements - https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.26.2",