diff --git a/src/main/java/gregtech/client/particle/GTParticleManager.java b/src/main/java/gregtech/client/particle/GTParticleManager.java
index d9e6b127f1b..7e49da1713d 100644
--- a/src/main/java/gregtech/client/particle/GTParticleManager.java
+++ b/src/main/java/gregtech/client/particle/GTParticleManager.java
@@ -142,10 +142,10 @@ public void renderParticles(@NotNull Entity renderViewEntity, float partialTicks
 
     private static void renderGlParticlesInLayer(@NotNull Map<@Nullable IRenderSetup, ArrayDeque<GTParticle>> renderQueue,
                                                  @NotNull EffectRenderContext context) {
-        for (var e : renderQueue.entrySet()) {
+        for (var entry : renderQueue.entrySet()) {
             @Nullable
-            IRenderSetup handler = e.getKey();
-            ArrayDeque<GTParticle> particles = e.getValue();
+            IRenderSetup handler = entry.getKey();
+            ArrayDeque<GTParticle> particles = entry.getValue();
             if (particles.isEmpty()) continue;
 
             boolean initialized = false;
@@ -160,8 +160,8 @@ private static void renderGlParticlesInLayer(@NotNull Map<@Nullable IRenderSetup
                             }
                         }
                         particle.renderParticle(buffer, context);
-                    } catch (Throwable throwable) {
-                        GTLog.logger.error("particle render error: {}", particle.toString(), throwable);
+                    } catch (RuntimeException e) {
+                        GTLog.logger.error("particle render error: {}", particle.toString(), e);
                         particle.setExpired();
                     }
                 }
diff --git a/src/main/java/gregtech/common/covers/facade/FacadeHelper.java b/src/main/java/gregtech/common/covers/facade/FacadeHelper.java
index 890f1a22afe..30a6375924d 100644
--- a/src/main/java/gregtech/common/covers/facade/FacadeHelper.java
+++ b/src/main/java/gregtech/common/covers/facade/FacadeHelper.java
@@ -52,15 +52,15 @@ public static IBlockState lookupBlockForItem(ItemStack itemStack) {
     }
 
     private static IBlockState lookupBlockForItemUnsafe(ItemStack itemStack) {
-        if (!(itemStack.getItem() instanceof ItemBlock)) {
+        if (!(itemStack.getItem() instanceof ItemBlock itemBlock)) {
             return null;
         }
-        Block block = ((ItemBlock) itemStack.getItem()).getBlock();
+        Block block = itemBlock.getBlock();
         int blockMetadata = itemStack.getItem().getMetadata(itemStack);
         try {
             // noinspection deprecation
             return block.getStateFromMeta(blockMetadata);
-        } catch (Throwable e) {
+        } catch (RuntimeException e) {
             return null;
         }
     }
diff --git a/src/main/java/gregtech/common/gui/widget/monitor/WidgetCoverList.java b/src/main/java/gregtech/common/gui/widget/monitor/WidgetCoverList.java
index 5706c8a6787..20f909455da 100644
--- a/src/main/java/gregtech/common/gui/widget/monitor/WidgetCoverList.java
+++ b/src/main/java/gregtech/common/gui/widget/monitor/WidgetCoverList.java
@@ -92,8 +92,8 @@ public boolean mouseClicked(int mouseX, int mouseY, int button) {
         if (!result && mouseY >= this.getPosition().y && mouseY <= this.getPosition().y + this.getSize().height) {
             Widget widget = this.widgets.stream().filter(it -> it.isMouseOverElement(mouseX, mouseY)).findFirst()
                     .orElse(null);
-            if (widget instanceof WidgetGroup) {
-                List<Widget> children = ((WidgetGroup) widget).getContainedWidgets(true);
+            if (widget instanceof WidgetGroup wg) {
+                List<Widget> children = wg.getContainedWidgets(true);
                 if (children.get(0).isMouseOverElement(mouseX, mouseY)) {
                     try {
                         String posString = ObfuscationReflectionHelper.getPrivateValue(LabelWidget.class,
@@ -108,7 +108,7 @@ public boolean mouseClicked(int mouseX, int mouseY, int button) {
                                 ((SlotWidget) children.get(0)).getHandle().getStack().getDisplayName() +
                                         ": " + posString));
                         return false;
-                    } catch (Throwable e) {
+                    } catch (NumberFormatException e) {
                         GTLog.logger.error("Could not reflect GregTech WidgetLabel text", e);
                     }
                 }
diff --git a/src/main/java/gregtech/common/items/EnchantmentTableTweaks.java b/src/main/java/gregtech/common/items/EnchantmentTableTweaks.java
index d1044f3cbe8..795ab95c332 100644
--- a/src/main/java/gregtech/common/items/EnchantmentTableTweaks.java
+++ b/src/main/java/gregtech/common/items/EnchantmentTableTweaks.java
@@ -53,7 +53,7 @@ private static void onContainerOpen(Container container) {
                     resultSlot.slotNumber = previousLapisSlot.slotNumber;
                     container.inventorySlots.set(index, resultSlot);
                 }
-            } catch (Throwable exception) {
+            } catch (RuntimeException exception) {
                 GTLog.logger.warn("Failed to replace enchantment container slot", exception);
             }
         }
diff --git a/src/main/java/gregtech/common/worldgen/LootTableHelper.java b/src/main/java/gregtech/common/worldgen/LootTableHelper.java
index 0f288beece1..fda461996f0 100644
--- a/src/main/java/gregtech/common/worldgen/LootTableHelper.java
+++ b/src/main/java/gregtech/common/worldgen/LootTableHelper.java
@@ -55,9 +55,9 @@ public static void initialize() {
             gsonField.setAccessible(true);
             Gson gsonInstance = (Gson) gsonField.get(null);
             replaceGsonTypeHierarchySerializer(gsonInstance, LootEntry.class, LootTableEntrySerializerDelegate::new);
-        } catch (Throwable exception) {
-            GTLog.logger.fatal("Failed to initialize loot table helper", exception);
-            throw new RuntimeException(exception);
+        } catch (SecurityException | IllegalAccessException e) {
+            GTLog.logger.fatal("Failed to initialize loot table helper", e);
+            throw new IllegalStateException(e);
         }
         registerLootEntry("gregtech:meta_item", LootEntryMetaItem::deserialize);
         registerLootEntry("gregtech:ore_dict", LootEntryOreDict::deserialize);