Skip to content

Dev/26.1 #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hiiragi283 merged 7 commits into from
Sep 18, 2026
Merged

Dev/26.1 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bc7167d
feat: Enchanting Recipe で完成品の要件を緩和
Hiiragi283 Sep 17, 2026
8463296
refactor: `HTBottleType.filledItem`を`Item`から`HTSimpleDeferredItem`に変更
Hiiragi283 Sep 17, 2026
0ef1245
refactor: Ore Slurry Data関連のクラスのパッケージを変更
Hiiragi283 Sep 17, 2026
0f7096d
refactor: RagiumOreSlurryDataをapiモジュールに移動
Hiiragi283 Sep 17, 2026
b6606f1
refactor: コードの整形
Hiiragi283 Sep 17, 2026
2e85b5c
feat: RagiumDataComponents.ORE_SLURRY_DATAが`Holder.Direct<HTOreSlurry…
Hiiragi283 Sep 17, 2026
87594e5
feat: NonEmptyList / Nel を追加
Hiiragi283 Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/client/kotlin/hiiragi283/ragium/client/integration/jei/RagiumJeiPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ import hiiragi283.lib.integration.jei.category.HTItemToDoubleItemRecipeCategory
import hiiragi283.lib.integration.jei.category.HTItemToItemAndFluidRecipeCategory
import hiiragi283.lib.integration.jei.category.HTSingleRecipeCategory
import hiiragi283.lib.item.HTPotionBasedItem
import hiiragi283.lib.item.ItemStack
import hiiragi283.lib.item.alchemy.HTBottleType
import hiiragi283.lib.item.alchemy.HTPotionHelper
import hiiragi283.lib.recipe.ingredient.HTPotionFluidIngredient
import hiiragi283.lib.registry.getKeyOrThrow
import hiiragi283.ragium.api.RagiumAPI
import hiiragi283.ragium.api.RagiumRegistries
import hiiragi283.ragium.api.data.recipe.HTOreSlurryData
import hiiragi283.ragium.api.data.recipe.HTOreSlurryDataHelper
import hiiragi283.ragium.api.data.oreSlurry.HTOreSlurryData
import hiiragi283.ragium.api.data.oreSlurry.HTOreSlurryDataHelper
import hiiragi283.ragium.api.data.recipe.builder.RagiumRecipeBuilders
import hiiragi283.ragium.api.recipe.RagiumRecipeLookups
import hiiragi283.ragium.client.gui.screen.HTWidgetContainerScreen
Expand Down Expand Up @@ -185,7 +184,7 @@ class RagiumJeiPlugin : HTJeiPlugin(RagiumAPI.MOD_ID) {
HTBottleType.entries.map { bottleType: HTBottleType ->
RagiumRecipeBuilders.draining {
+HTJeiRecipeHelper.fakeItem(
ItemStack(bottleType.filledItem, 1, HTPotionHelper.createPotionPatch(potion))
bottleType.filledItem.toStack(patch = HTPotionHelper.createPotionPatch(potion))
)
itemResult { +bottleType.emptyItem }
fluidResult { from(HTPotionHelper.createFluid(potion, HTPotionHelper.BOTTLE_AMOUNT)) }
Expand All @@ -208,7 +207,7 @@ class RagiumJeiPlugin : HTJeiPlugin(RagiumAPI.MOD_ID) {
amount = HTPotionHelper.BOTTLE_AMOUNT
}
result {
from(ItemStack(bottleType.filledItem, 1, HTPotionHelper.createPotionPatch(potion)))
from(bottleType.filledItem.toStack(patch = HTPotionHelper.createPotionPatch(potion)))
}
recipeId replace potion.getKeyOrThrow()
.identifier()
Expand Down
2 changes: 1 addition & 1 deletion src/data/kotlin/hiiragi283/ragium/data/RagiumDataGen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package hiiragi283.ragium.data

import hiiragi283.lib.data.createLootTables
import hiiragi283.ragium.api.RagiumRegistries
import hiiragi283.ragium.common.data.recipe.RagiumOreSlurryData
import hiiragi283.ragium.api.data.oreSlurry.RagiumOreSlurryData
import hiiragi283.ragium.data.advancement.RagiumAdvancementProvider
import hiiragi283.ragium.data.lang.RagiumEnglishLangProvider
import hiiragi283.ragium.data.lang.RagiumJapaneseLangProvider
Expand Down
2 changes: 1 addition & 1 deletion src/data/kotlin/hiiragi283/ragium/data/lang/RagiumEnglishLangProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import hiiragi283.lib.data.lang.HTLangProvider
import hiiragi283.lib.data.lang.HTLangTypes
import hiiragi283.lib.text.HTCommonTranslation
import hiiragi283.ragium.api.RagiumAPI
import hiiragi283.ragium.api.data.oreSlurry.RagiumOreSlurryData
import hiiragi283.ragium.api.recipe.RagiumRecipeTypes
import hiiragi283.ragium.api.text.RagiumTranslation
import hiiragi283.ragium.common.advancment.RagiumAdvancementKeys
import hiiragi283.ragium.common.block.RagiumBlocks
import hiiragi283.ragium.common.data.recipe.RagiumOreSlurryData
import hiiragi283.ragium.common.effect.RagiumMobEffects
import hiiragi283.ragium.common.fluid.RagiumFluids
import hiiragi283.ragium.common.item.RagiumItems
Expand Down
2 changes: 1 addition & 1 deletion src/data/kotlin/hiiragi283/ragium/data/lang/RagiumJapaneseLangProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import hiiragi283.lib.data.lang.HTLangProvider
import hiiragi283.lib.data.lang.HTLangTypes
import hiiragi283.lib.text.HTCommonTranslation
import hiiragi283.ragium.api.RagiumAPI
import hiiragi283.ragium.api.data.oreSlurry.RagiumOreSlurryData
import hiiragi283.ragium.api.recipe.RagiumRecipeTypes
import hiiragi283.ragium.api.text.RagiumTranslation
import hiiragi283.ragium.common.advancment.RagiumAdvancementKeys
import hiiragi283.ragium.common.block.RagiumBlocks
import hiiragi283.ragium.common.data.recipe.RagiumOreSlurryData
import hiiragi283.ragium.common.effect.RagiumMobEffects
import hiiragi283.ragium.common.fluid.RagiumFluids
import hiiragi283.ragium.common.item.RagiumItems
Expand Down
8 changes: 5 additions & 3 deletions src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumArcaneRecipeProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class RagiumArcaneRecipeProvider(packOutput: PackOutput, future: CompletableFutu
+holderSet(CommonTagPrefixes.INGOT, RagiumMaterial.Metal.IRON)
count = 64
}
+registries.getOrThrow(Enchantments.PROTECTION)
result { +registries.getOrThrow(Enchantments.PROTECTION) }
}.save(exporter)
// Diamond -> Protection + Unbreaking
RagiumRecipeBuilders.enchanting {
Expand All @@ -32,8 +32,10 @@ class RagiumArcaneRecipeProvider(packOutput: PackOutput, future: CompletableFutu
count = 16
}
result {
set(registries.getOrThrow(Enchantments.PROTECTION), 4)
set(registries.getOrThrow(Enchantments.UNBREAKING), 3)
enchantedBook {
set(registries.getOrThrow(Enchantments.PROTECTION), 4)
set(registries.getOrThrow(Enchantments.UNBREAKING), 3)
}
}
recipeId replace id("diamond_armor")
}.save(exporter)
Expand Down
12 changes: 6 additions & 6 deletions src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumBioRecipeProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ class RagiumBioRecipeProvider(packOutput: PackOutput, future: CompletableFuture<
+holderSet(seedIn)
count = 8
}
primary {
result {
+crop
count = 12
}
secondary {
result {
+seedOut
count = 12
}
Expand All @@ -160,7 +160,7 @@ class RagiumBioRecipeProvider(packOutput: PackOutput, future: CompletableFuture<
items { +crop }
count = 8
}
primary {
result {
+crop
count = 16
}
Expand All @@ -173,7 +173,7 @@ class RagiumBioRecipeProvider(packOutput: PackOutput, future: CompletableFuture<
items { +crop }
count = 8
}
primary {
result {
+crop
count = 24
}
Expand All @@ -199,11 +199,11 @@ class RagiumBioRecipeProvider(packOutput: PackOutput, future: CompletableFuture<
items { +sapling }
count = 8
}
primary {
result {
+log
count = 48
}
secondary {
result {
+sapling
count = 12
}
Expand Down
Loading
Loading