aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt2
-rw-r--r--src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt6
-rw-r--r--src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt4
-rw-r--r--src/main/kotlin/moe/nea/firmament/rei/recipes/SBCraftingRecipe.kt (renamed from src/main/kotlin/moe/nea/firmament/recipes/SBCraftingRecipe.kt)2
-rw-r--r--src/main/kotlin/moe/nea/firmament/rei/recipes/SBForgeRecipe.kt (renamed from src/main/kotlin/moe/nea/firmament/recipes/SBForgeRecipe.kt)2
-rw-r--r--src/main/kotlin/moe/nea/firmament/rei/recipes/SBRecipe.kt (renamed from src/main/kotlin/moe/nea/firmament/recipes/SBRecipe.kt)2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt
index 8de88aa..e7f821d 100644
--- a/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt
@@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack
import net.minecraft.util.Formatting
import moe.nea.firmament.events.SlotRenderEvents
import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.recipes.SBCraftingRecipe
+import moe.nea.firmament.rei.recipes.SBCraftingRecipe
import moe.nea.firmament.rei.FirmamentReiPlugin.Companion.asItemEntry
import moe.nea.firmament.rei.SBItemEntryDefinition
import moe.nea.firmament.util.MC
diff --git a/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt b/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt
index 7f7110f..b39dafa 100644
--- a/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt
@@ -25,8 +25,8 @@ import net.minecraft.text.Text
import net.minecraft.util.Identifier
import moe.nea.firmament.events.HandledScreenPushREIEvent
import moe.nea.firmament.features.inventory.CraftingOverlay
-import moe.nea.firmament.recipes.SBCraftingRecipe
-import moe.nea.firmament.recipes.SBForgeRecipe
+import moe.nea.firmament.rei.recipes.SBCraftingRecipe
+import moe.nea.firmament.rei.recipes.SBForgeRecipe
import moe.nea.firmament.repo.RepoManager
import moe.nea.firmament.util.SkyblockId
import moe.nea.firmament.util.skyblockId
@@ -52,7 +52,7 @@ class FirmamentReiPlugin : REIClientPlugin {
}
if (context.isActuallyCrafting)
CraftingOverlay.setOverlay(screen, display)
- return@TransferHandler TransferHandler.Result.createSuccessful()
+ return@TransferHandler TransferHandler.Result.createSuccessful().blocksFurtherHandling(true)
})
}
diff --git a/src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt b/src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt
index c6b20c1..0a4f32d 100644
--- a/src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/SkyblockCraftingRecipeDynamicGenerator.kt
@@ -15,8 +15,8 @@ import me.shedaniel.rei.api.client.registry.display.DynamicDisplayGenerator
import me.shedaniel.rei.api.client.view.ViewSearchBuilder
import me.shedaniel.rei.api.common.display.Display
import me.shedaniel.rei.api.common.entry.EntryStack
-import moe.nea.firmament.recipes.SBCraftingRecipe
-import moe.nea.firmament.recipes.SBForgeRecipe
+import moe.nea.firmament.rei.recipes.SBCraftingRecipe
+import moe.nea.firmament.rei.recipes.SBForgeRecipe
import moe.nea.firmament.repo.RepoManager
import moe.nea.firmament.util.skyblockId
diff --git a/src/main/kotlin/moe/nea/firmament/recipes/SBCraftingRecipe.kt b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBCraftingRecipe.kt
index 5898174..b53f874 100644
--- a/src/main/kotlin/moe/nea/firmament/recipes/SBCraftingRecipe.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBCraftingRecipe.kt
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package moe.nea.firmament.recipes
+package moe.nea.firmament.rei.recipes
import io.github.moulberry.repo.data.NEUCraftingRecipe
import io.github.moulberry.repo.data.NEUIngredient
diff --git a/src/main/kotlin/moe/nea/firmament/recipes/SBForgeRecipe.kt b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBForgeRecipe.kt
index 604ef12..3960728 100644
--- a/src/main/kotlin/moe/nea/firmament/recipes/SBForgeRecipe.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBForgeRecipe.kt
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package moe.nea.firmament.recipes
+package moe.nea.firmament.rei.recipes
import io.github.moulberry.repo.data.NEUForgeRecipe
import me.shedaniel.math.Point
diff --git a/src/main/kotlin/moe/nea/firmament/recipes/SBRecipe.kt b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBRecipe.kt
index 7527783..9a64857 100644
--- a/src/main/kotlin/moe/nea/firmament/recipes/SBRecipe.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBRecipe.kt
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package moe.nea.firmament.recipes
+package moe.nea.firmament.rei.recipes
import io.github.moulberry.repo.data.NEURecipe
import me.shedaniel.rei.api.common.display.Display