From 3342fbbaf993fd260b8b0be0c1468bbc6edfe1ca Mon Sep 17 00:00:00 2001 From: Nicholas Smit Date: Sun, 22 Oct 2023 23:43:51 -0400 Subject: [PATCH 1/3] Fix molten tool recipes Fix error in molten tool recipes not using the template. --- .../data/immersiveweapons/recipes/molten_axe_smithing.json | 2 +- .../data/immersiveweapons/recipes/molten_gauntlet_smithing.json | 2 +- .../data/immersiveweapons/recipes/molten_hoe_smithing.json | 2 +- .../data/immersiveweapons/recipes/molten_pickaxe_smithing.json | 2 +- .../data/immersiveweapons/recipes/molten_pike_smithing.json | 2 +- .../data/immersiveweapons/recipes/molten_shovel_smithing.json | 2 +- .../data/immersiveweapons/recipes/molten_sword_smithing.json | 2 +- .../immersiveweapons/data/recipes/families/ToolFamilies.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/generated/resources/data/immersiveweapons/recipes/molten_axe_smithing.json b/src/generated/resources/data/immersiveweapons/recipes/molten_axe_smithing.json index 5a5a1e8e8..70a817d2c 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/molten_axe_smithing.json +++ b/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" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/molten_gauntlet_smithing.json b/src/generated/resources/data/immersiveweapons/recipes/molten_gauntlet_smithing.json index db75715c5..dc7b28274 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/molten_gauntlet_smithing.json +++ b/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" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/molten_hoe_smithing.json b/src/generated/resources/data/immersiveweapons/recipes/molten_hoe_smithing.json index b3bdacfdf..2f17734f6 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/molten_hoe_smithing.json +++ b/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" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/molten_pickaxe_smithing.json b/src/generated/resources/data/immersiveweapons/recipes/molten_pickaxe_smithing.json index 1ee10aee0..f6bd5de9e 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/molten_pickaxe_smithing.json +++ b/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" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/molten_pike_smithing.json b/src/generated/resources/data/immersiveweapons/recipes/molten_pike_smithing.json index 0e4b05227..9a395cc7e 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/molten_pike_smithing.json +++ b/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" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/molten_shovel_smithing.json b/src/generated/resources/data/immersiveweapons/recipes/molten_shovel_smithing.json index ad2b5add2..f33945cb0 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/molten_shovel_smithing.json +++ b/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" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/molten_sword_smithing.json b/src/generated/resources/data/immersiveweapons/recipes/molten_sword_smithing.json index cfd03a25d..fdacdf8a8 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/molten_sword_smithing.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/java/tech/anonymoushacker1279/immersiveweapons/data/recipes/families/ToolFamilies.java b/src/main/java/tech/anonymoushacker1279/immersiveweapons/data/recipes/families/ToolFamilies.java index 9382ceafc..575cdb4e1 100644 --- a/src/main/java/tech/anonymoushacker1279/immersiveweapons/data/recipes/families/ToolFamilies.java +++ b/src/main/java/tech/anonymoushacker1279/immersiveweapons/data/recipes/families/ToolFamilies.java @@ -80,7 +80,7 @@ public record ToolFamilies(TagKey material, ItemRegistry.MOLTEN_PIKE, null, ItemRegistry.MOLTEN_ARROW, - ItemRegistry.MOLTEN_MUSKET_BALL, + ItemRegistry.MOLTEN_SMITHING_TEMPLATE, NETHERITE_TOOLS ); From ec07c16ac9f09f1cc275edccbfdba83f275d5ccf Mon Sep 17 00:00:00 2001 From: Nicholas Smit Date: Tue, 24 Oct 2023 18:10:26 -0400 Subject: [PATCH 2/3] Fix duplication bug in the ammunition table Fix major duplication bug when shift-clicking recipe results out of the ammunition table. Also fixes a bug that causes ammo to drop when the table is broken, along with the materials. Minor adjustment to ammunition table model. Also adds Swift Sneak to the Skygazer max level config at level 5. --- build.gradle | 2 -- gradle.properties | 2 +- .../block/crafting/AmmunitionTableBlock.java | 2 +- .../AmmunitionTableBlockEntity.java | 2 +- .../immersiveweapons/config/CommonConfig.java | 3 ++- .../menu/AmmunitionTableMenu.java | 4 +++- .../models/block/ammunition_table.json | 19 +++--------------- .../textures/block/ammunition_table.png | Bin 893 -> 1171 bytes 8 files changed, 11 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 6d2d24550..faa39ef47 100644 --- a/build.gradle +++ b/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' } } } diff --git a/gradle.properties b/gradle.properties index f13401b90..048f6db81 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/tech/anonymoushacker1279/immersiveweapons/block/crafting/AmmunitionTableBlock.java b/src/main/java/tech/anonymoushacker1279/immersiveweapons/block/crafting/AmmunitionTableBlock.java index fb700459f..bbbbf2bc8 100644 --- a/src/main/java/tech/anonymoushacker1279/immersiveweapons/block/crafting/AmmunitionTableBlock.java +++ b/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); diff --git a/src/main/java/tech/anonymoushacker1279/immersiveweapons/blockentity/AmmunitionTableBlockEntity.java b/src/main/java/tech/anonymoushacker1279/immersiveweapons/blockentity/AmmunitionTableBlockEntity.java index f898a1eee..4b7547672 100644 --- a/src/main/java/tech/anonymoushacker1279/immersiveweapons/blockentity/AmmunitionTableBlockEntity.java +++ b/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; } diff --git a/src/main/java/tech/anonymoushacker1279/immersiveweapons/config/CommonConfig.java b/src/main/java/tech/anonymoushacker1279/immersiveweapons/config/CommonConfig.java index ad8f43e81..4a2dce7d1 100644 --- a/src/main/java/tech/anonymoushacker1279/immersiveweapons/config/CommonConfig.java +++ b/src/main/java/tech/anonymoushacker1279/immersiveweapons/config/CommonConfig.java @@ -208,7 +208,7 @@ public static CommonConfig create(ForgeConfigSpec.Builder builder) { @NotNull private static Map getEnchantCapsMap() { - Map enchantCaps = new HashMap<>(20); + Map 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 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); diff --git a/src/main/java/tech/anonymoushacker1279/immersiveweapons/menu/AmmunitionTableMenu.java b/src/main/java/tech/anonymoushacker1279/immersiveweapons/menu/AmmunitionTableMenu.java index a6a62868a..f835dfbe4 100644 --- a/src/main/java/tech/anonymoushacker1279/immersiveweapons/menu/AmmunitionTableMenu.java +++ b/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; diff --git a/src/main/resources/assets/immersiveweapons/models/block/ammunition_table.json b/src/main/resources/assets/immersiveweapons/models/block/ammunition_table.json index 437348114..cc5258b19 100644 --- a/src/main/resources/assets/immersiveweapons/models/block/ammunition_table.json +++ b/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] } ] } diff --git a/src/main/resources/assets/immersiveweapons/textures/block/ammunition_table.png b/src/main/resources/assets/immersiveweapons/textures/block/ammunition_table.png index edd75809d9b5c165c75680c69f7e757c1feed9c8..4bad0fd5b0fcf1780e77f0b9d9a7b5a27f8dc938 100644 GIT binary patch delta 1151 zcmV-_1c3Yf29pVpBYy#IX+uL$X=7sm04R}lkIjAATE9#{0Cf>E2R`E$<5ubi?;E+R_!MHPVYRQzVG{e zdgeRepUE0Ir+xx*rfWy0!`ec8QEPmmnIK*C(w;CJYc@I+qkrc5yu+vJ?U3qK``*8+ zWhLnt;A;{dGc4N`mT8z-cP+)+!ktDYu_AmZJZQ^+!dFVy%lxc3UFLVib}TXpe$`V; zSFv8jM#jzw4+w{H*}U;PkNT28(wvVx0G}C>1^L>&Wv; z$58hO7iPu3COM6Nh+eE{p#x~!gtNSX&L ztKV}@?jg1zzvvqF_Mu%m*_ z(&DW~5duOA3LbhX(jG(vmEyrPV9{W@#actKdeF5pfJ~-WV zli41R#KjRf*IxRo4_v)`ipBT`Wgd=5Z4F~+LqsBx+ViMkER)GVzkCTMdLD`)aQlhV zuyEIg5I{X77D|gys4TNk!M0i`!~5FKqx0eLL2XSo`i7w zoz&)oi)SM+@iuQQ0R+ZArBP~050r5*?s=en?!}PxCs5ygkGAuAag7;AFO7;QWDc_* zxNstn+a002ovPDHLkV1i+nHNgM? delta 871 zcmV-t1DO1i3H=6;BYy)#Nklk3k=k{2>qS8YyAxN%okkG5s$dbMn=W)ABB+RqI~H0rSm$C*nfy-Lpm8xhlbIx% zNl$1Ld^SnGbLO1)J9)qP&W2m#S1Y)fd6@^`LGs21d@wzJwtr%ki-fwughLza#*5b1 zAI9h3r`UOH6oBVbV;KK`M%}rcqo*$cFgQ5aR722@$YzAP!dT@ZRvCSu zuCOE4Di@u(0EW3lNa+PY(=;^go@Y&6*M03>m%x>OzH#vMO<$)EAWmNhQ~S0$2^r>+ zXRZ?IaptQ^oPYWEDgK)pL(}fj-~X30Z+7-0&!@)LmO!gaPQN8vSOy>(=>{NMSSDLo zS&eO4jja%kZ1Tjjg%x(I;fCuPi&{_%2*GwjkRQ>1+h)-( z+fxHD>lv?|bK$@+x~?~Tjru|QADA9LTM_Shx5u|cH~;jxqV*NSTw?h0BPk7S=>zF( zuIla8Pk&Jl0#O&@6TmX_(tArMV4r@tp}(P8z~Z|YSCu%1?B=w=LMIRPRlxRmqdwps z6aB(H_T=?~lm_Vpp58uJnKKqql{oHN0QRo zPQ*l^TV>guZQ4@AW}$?MU7)HG$0`?{Mke}zh<}-snyl6uZK(nGeFwbtV8@s1?m`0D z8VH^r9j)Z@c@l{P0F#rG#9}c35{U${Sd2_2L+V3{ceC#p=pW$XzZacN5AW~e#>5Nh zgIFs;A%19Rs7^#One2q7mIwk3#jh9IUbWJERuz5T@MsOl3fQ%yS9Xay-pr(VGn4i; zH(;2_WZEvE6>3iup!;v}t$D8wjEs!5S<*T)F)`7S2Y)pJsSl}6Ymg%F>C-}|HAoT2 x<>l|>og^^OKhS9nQb_lKPV?K>z#sk~$#?3#e7`)DHB$fp002ovPDHLkV1irds>T2S From 6aeab1ad2e4fa898179758460c05297cec0c1efc Mon Sep 17 00:00:00 2001 From: Nicholas Smit Date: Tue, 24 Oct 2023 19:34:05 -0400 Subject: [PATCH 3/3] Prepare for release Bump versions and prepare for release. --- RELEASE_NOTES.md | 18 +++++------------- update.json | 5 +++-- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index c5499573f..4f4e9ba29 100644 --- a/RELEASE_NOTES.md +++ b/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 \ No newline at end of file +- 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 \ No newline at end of file diff --git a/update.json b/update.json index 80cd27b00..0dc7350d7 100644 --- a/update.json +++ b/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",