From 0d75fd5b215907f1ed35143b2695fde72076f981 Mon Sep 17 00:00:00 2001 From: RuyaSavascisi Date: Tue, 24 Sep 2024 21:29:54 +0300 Subject: [PATCH 1/2] Correction for tr_tr.json --- src/main/resources/assets/sophisticatedstorage/lang/tr_tr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/sophisticatedstorage/lang/tr_tr.json b/src/main/resources/assets/sophisticatedstorage/lang/tr_tr.json index 98228b14..71e6de9d 100644 --- a/src/main/resources/assets/sophisticatedstorage/lang/tr_tr.json +++ b/src/main/resources/assets/sophisticatedstorage/lang/tr_tr.json @@ -10,7 +10,7 @@ "wood_name.sophisticatedstorage.warped": "Çarpık", "wood_name.sophisticatedstorage.cherry": "Kiraz Ağacı", "wood_name.sophisticatedstorage.bamboo": "Bambu", - "itemGroup.sophisticatedstorage": "Sophisticated Depo", + "itemGroup.sophisticatedstorage": "Sophisticated Storage", "item.sophisticatedstorage.packing_tape": "Paketleme Bandı", "item.sophisticatedstorage.packing_tape.tooltip": "Kalan kullanım: %s", "item.sophisticatedstorage.packing_tape.tooltip.disabled": "Devre dışı - yapılandırma tüm depoları paketlenmiş olarak bırakmaya ayarlı", From 50457681cec820c9929c73b2539c49776a17f517 Mon Sep 17 00:00:00 2001 From: P3pp3rF1y Date: Wed, 6 Nov 2024 23:42:43 +0100 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fixed=20sorting=20to?= =?UTF-8?q?=20trigger=20when=20cursor=20is=20anywhere=20outside=20of=20sto?= =?UTF-8?q?rage=20slots.=20Fixes=20the=20behavior=20where=20sorting=20mods?= =?UTF-8?q?=20would=20sort=20sophisticated=20inventories=20when=20middle?= =?UTF-8?q?=20click=20is=20used=20with=20cursor=20outside=20of=20any=20slo?= =?UTF-8?q?t=20which=20caused=20item=20loss=20for=20example=20when=20stack?= =?UTF-8?q?=20upgrades=20were=20used.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../client/ClientEventHandler.java | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index d9e10f51..9f77c982 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.daemon=false mod_id=sophisticatedstorage mod_group_id=sophisticatedstorage -mod_version=0.10.45 +mod_version=0.10.46 sonar_project_key=sophisticatedstorage:SophisticatedStorage github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedStorage diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/client/ClientEventHandler.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/client/ClientEventHandler.java index 32b57611..2f73fc93 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/client/ClientEventHandler.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/client/ClientEventHandler.java @@ -22,7 +22,6 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraftforge.client.event.*; @@ -43,19 +42,7 @@ import net.p3pp3rf1y.sophisticatedstorage.client.init.ModBlockColors; import net.p3pp3rf1y.sophisticatedstorage.client.init.ModItemColors; import net.p3pp3rf1y.sophisticatedstorage.client.init.ModParticles; -import net.p3pp3rf1y.sophisticatedstorage.client.render.BarrelBakedModelBase; -import net.p3pp3rf1y.sophisticatedstorage.client.render.BarrelDynamicModel; -import net.p3pp3rf1y.sophisticatedstorage.client.render.BarrelDynamicModelBase; -import net.p3pp3rf1y.sophisticatedstorage.client.render.BarrelRenderer; -import net.p3pp3rf1y.sophisticatedstorage.client.render.ChestDynamicModel; -import net.p3pp3rf1y.sophisticatedstorage.client.render.ChestRenderer; -import net.p3pp3rf1y.sophisticatedstorage.client.render.ClientStorageContentsTooltip; -import net.p3pp3rf1y.sophisticatedstorage.client.render.ControllerRenderer; -import net.p3pp3rf1y.sophisticatedstorage.client.render.LimitedBarrelDynamicModel; -import net.p3pp3rf1y.sophisticatedstorage.client.render.LimitedBarrelRenderer; -import net.p3pp3rf1y.sophisticatedstorage.client.render.ShulkerBoxDynamicModel; -import net.p3pp3rf1y.sophisticatedstorage.client.render.ShulkerBoxRenderer; -import net.p3pp3rf1y.sophisticatedstorage.client.render.SimpleCompositeModel; +import net.p3pp3rf1y.sophisticatedstorage.client.render.*; import net.p3pp3rf1y.sophisticatedstorage.common.gui.StorageContainerMenu; import net.p3pp3rf1y.sophisticatedstorage.init.ModBlocks; import net.p3pp3rf1y.sophisticatedstorage.init.ModItems; @@ -220,7 +207,7 @@ private static boolean tryCallSort(Screen gui) { double mouseX = mh.xpos() * mc.getWindow().getGuiScaledWidth() / mc.getWindow().getScreenWidth(); double mouseY = mh.ypos() * mc.getWindow().getGuiScaledHeight() / mc.getWindow().getScreenHeight(); Slot selectedSlot = screen.findSlot(mouseX, mouseY); - if (selectedSlot != null && container.isNotPlayersInventorySlot(selectedSlot.index)) { + if (selectedSlot == null || container.isNotPlayersInventorySlot(selectedSlot.index)) { container.sort(); return true; }