Skip to content

Commit b62c298

Browse files
committed
3.5.1 Update
- Added additional checks for null NBT tags, fixed a rare crash with NBT tags not applying to new Exchangers properly, closes #69
1 parent 40e9548 commit b62c298

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

build.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ repositories {
6262
name = 'ModMaven'
6363
url = 'https://modmaven.dev'
6464
}
65-
maven {
66-
name = 'JEI Maven'
67-
url = 'https://dvs1.progwml6.com/files/maven'
68-
content {
69-
includeGroup 'mezz.jei'
70-
}
71-
}
7265
maven {
7366
name = 'Curse Maven'
7467
url = 'https://www.cursemaven.com'
@@ -87,7 +80,7 @@ dependencies {
8780

8881
implementation fg.deobf("curse.maven:gunpowderlib-356646:4573505") //1.20-2.2
8982

90-
runtimeOnly fg.deobf("curse.maven:ender_io-64578:4637542") //6.0.5-alpha
83+
runtimeOnly fg.deobf("curse.maven:ender_io-64578:4719371") //6.0.18-alpha
9184
//runtimeOnly fg.deobf("curse.maven:mekanism-268560:")
9285
//runtimeOnly fg.deobf("curse.maven:immersive_engineering-231951:")
9386
//runtimeOnly fg.deobf("curse.maven:cofh_core-69162:")

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ mod_name=Exchangers
77
mc_version=1.20.1
88
mc_version_range=[1.20,1.21)
99

10-
forge_version=47.1.28
10+
forge_version=47.1.46
1111
forge_version_range=[46,)
1212
loader_version_range=[46,)
1313

1414
mappings_channel=official
1515
mappings_version=1.20.1
1616

17-
mod_version=3.5
17+
mod_version=3.5.1
1818
mod_license=Jacky's Minecraft Mods License
1919
mod_authors=Jackyy, TurkeyDev
2020
mod_description=Block Exchangers.

src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ public void onKeyInput(InputEvent.Key event) {
146146
if (player != null) {
147147
ItemStack heldItem = player.getMainHandItem();
148148
if (!heldItem.isEmpty() && heldItem.getItem() instanceof ItemExchangerBase) {
149+
ExchangerHandler.setDefaultTagCompound(heldItem);
149150
if (Keys.OPEN_GUI_KEY.get().isDown()) {
150151
mc.setScreen(new ExchangersGuiScreen());
151152
} else if (Keys.RANGE_SWITCH_KEY.get().isDown()) {

src/main/java/jackyy/exchangers/item/ItemExchangerBase.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ public InteractionResult useOn(UseOnContext context) {
5959
BlockPos pos = context.getClickedPos();
6060
Direction side = context.getClickedFace();
6161
if (!world.isClientSide() && player != null) {
62+
ItemStack mainHandStack = player.getMainHandItem();
63+
ExchangerHandler.setDefaultTagCompound(mainHandStack);
6264
if (player.isShiftKeyDown()) {
63-
ExchangerHandler.selectBlock(player.getMainHandItem(), player, world, pos);
65+
ExchangerHandler.selectBlock(mainHandStack, player, world, pos);
6466
} else {
65-
ExchangerHandler.placeBlock(player.getMainHandItem(), player, world, pos, side, context);
67+
ExchangerHandler.placeBlock(mainHandStack, player, world, pos, side, context);
6668
}
6769
}
6870
return InteractionResult.SUCCESS;

0 commit comments

Comments
 (0)