Skip to content

Commit

Permalink
3.3.1 Update
Browse files Browse the repository at this point in the history
  • Loading branch information
JackyyTV committed Sep 1, 2023
1 parent 32738e7 commit 6b77eff
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 19 deletions.
7 changes: 0 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,6 @@ repositories {
name = 'ModMaven'
url = 'https://modmaven.dev'
}
maven {
name = 'JEI Maven'
url = 'https://dvs1.progwml6.com/files/maven'
content {
includeGroup 'mezz.jei'
}
}
maven {
name = 'Curse Maven'
url = 'https://www.cursemaven.com'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ loader_version_range=[40,)
mappings_channel=official
mappings_version=1.18.2

mod_version=3.3
mod_version=3.3.1
mod_license=Jacky's Minecraft Mods License
mod_authors=Jackyy, TurkeyDev
mod_description=Block Exchangers.
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ public void onKeyInput(InputEvent.KeyInputEvent event) {
if (player != null) {
ItemStack heldItem = player.getMainHandItem();
if (!heldItem.isEmpty() && heldItem.getItem() instanceof ItemExchangerBase) {
ExchangerHandler.setDefaultTagCompound(heldItem);
if (Keys.OPEN_GUI_KEY.isDown()) {
mc.setScreen(new ExchangersGuiScreen());
} else if (Keys.RANGE_SWITCH_KEY.isDown()) {
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/jackyy/exchangers/item/ItemExchangerBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,12 @@ public InteractionResult useOn(UseOnContext context) {
BlockPos pos = context.getClickedPos();
Direction side = context.getClickedFace();
if (!world.isClientSide() && player != null) {
ItemStack mainHandStack = player.getMainHandItem();
ExchangerHandler.setDefaultTagCompound(mainHandStack);
if (player.isShiftKeyDown()) {
ExchangerHandler.selectBlock(player.getMainHandItem(), player, world, pos);
ExchangerHandler.selectBlock(mainHandStack, player, world, pos);
} else {
ExchangerHandler.placeBlock(player.getMainHandItem(), player, world, pos, side, context);
ExchangerHandler.placeBlock(mainHandStack, player, world, pos, side, context);
}
}
return InteractionResult.SUCCESS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ResourceLocation getID() {
return ID;
}

@Override @Deprecated
@Override @SuppressWarnings("removal")
public boolean test() {
return ModConfigs.CONFIG.immersiveEngineeringModule.get() == value;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ResourceLocation getID() {
return ID;
}

@Override @Deprecated
@Override @SuppressWarnings("removal")
public boolean test() {
return ModConfigs.CONFIG.mekanismModule.get() == value;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ResourceLocation getID() {
return ID;
}

@Override @Deprecated
@Override @SuppressWarnings("removal")
public boolean test() {
return ModConfigs.CONFIG.specialModule.get() == value;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ResourceLocation getID() {
return ID;
}

@Override @Deprecated
@Override @SuppressWarnings("removal")
public boolean test() {
return ModConfigs.CONFIG.thermalModule.get() == value;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ResourceLocation getID() {
return ID;
}

@Override @Deprecated
@Override @SuppressWarnings("removal")
public boolean test() {
return ModConfigs.CONFIG.vanillaModule.get() == value;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ResourceLocation getID() {
return ID;
}

@Override @Deprecated
@Override @SuppressWarnings("removal")
public boolean test() {
return ModConfigs.CONFIG.immersiveEngineeringRecipesType.get().equals(value);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ResourceLocation getID() {
return ID;
}

@Override @Deprecated
@Override @SuppressWarnings("removal")
public boolean test() {
return ModConfigs.CONFIG.mekanismRecipesType.get().equals(value);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ResourceLocation getID() {
return ID;
}

@Override
@Override @SuppressWarnings("removal")
public boolean test() {
return ModConfigs.CONFIG.thermalRecipesType.get().equals(value);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ResourceLocation getID() {
return ID;
}

@Override @Deprecated
@Override @SuppressWarnings("removal")
public boolean test() {
return ModConfigs.CONFIG.vanillaRecipesType.get().equals(value);
}
Expand Down

0 comments on commit 6b77eff

Please sign in to comment.