Skip to content

Commit 8976bc8

Browse files
Hiiragi283Hiiragi283
committed
- v0.1.0をリリース
- スターリング発電機のエネルギー計算を修正 - Capacityエンチャントの対象を制限 - エンチャントに説明を追加
1 parent 9427f98 commit 8976bc8

File tree

14 files changed

+65
-22
lines changed

14 files changed

+65
-22
lines changed

‎gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
minecraft = "1.21.1"
3-
ragium = "0.0.2"
3+
ragium = "0.1.0"
44

55
parchment-mc = "1.21.1"
66
parchment-map = "2024.11.17"

‎src/generated/resources/assets/ragium/lang/en_us.json

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"config.jade.plugin_ragium.error_message": "Show Error Message",
3131
"config.jade.plugin_ragium.machine_info": "Show Machine Info",
3232
"enchantment.ragium.capacity": "Capacity",
33+
"enchantment.ragium.capacity.desc": "Increase the capacity of item or fluid storages",
3334
"fluid_type.ragium.biodiesel": "Biodiesel",
3435
"fluid_type.ragium.biomass": "Biomass",
3536
"fluid_type.ragium.crimson_sap": "Crimson Sap",

‎src/generated/resources/assets/ragium/lang/ja_jp.json

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"config.jade.plugin_ragium.error_message": "エラーメッセージ",
3131
"config.jade.plugin_ragium.machine_info": "機械の情報",
3232
"enchantment.ragium.capacity": "容量増加",
33+
"enchantment.ragium.capacity.desc": "アイテムや液体ストレージの容量を拡張します",
3334
"fluid_type.ragium.biodiesel": "バイオディーゼル",
3435
"fluid_type.ragium.biomass": "バイオマス",
3536
"fluid_type.ragium.crimson_sap": "深紅の樹液",

‎src/generated/resources/data/ragium/enchantment/capacity.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
"slots": [
1616
"any"
1717
],
18-
"supported_items": {
19-
"type": "neoforge:any"
20-
},
18+
"supported_items": "#ragium:enchantable/capacity",
2119
"weight": 1
2220
}

‎src/generated/resources/data/ragium/tags/item/enchantable/capacity.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"values": [
3+
"ragium:alchemical_brewery",
4+
"ragium:arcane_enchanter",
5+
"ragium:assembler",
6+
"ragium:bedrock_miner",
7+
"ragium:blast_furnace",
8+
"ragium:combustion_generator",
9+
"ragium:compressor",
10+
"ragium:copper_drum",
11+
"ragium:extractor",
12+
"ragium:fisher",
13+
"ragium:grinder",
14+
"ragium:growth_chamber",
15+
"ragium:infuser",
16+
"ragium:laser_assembly",
17+
"ragium:loot_spawner",
18+
"ragium:manual_grinder",
19+
"ragium:mixer",
20+
"ragium:multi_smelter",
21+
"ragium:primitive_blast_furnace",
22+
"ragium:refinery",
23+
"ragium:solar_generator",
24+
"ragium:stirling_generator",
25+
"ragium:thermal_generator"
26+
]
27+
}

‎src/main/kotlin/hiiragi283/ragium/api/extension/DataExtensions.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ fun LanguageProvider.addFluid(fluid: Supplier<out Fluid>, value: String) {
2626
add(fluid.get().fluidType.descriptionId, value)
2727
}
2828

29-
fun LanguageProvider.addEnchantment(key: ResourceKey<Enchantment>, value: String) {
30-
add(Util.makeDescriptionId("enchantment", key.location()), value)
29+
fun LanguageProvider.addEnchantment(key: ResourceKey<Enchantment>, value: String, desc: String) {
30+
val translationKey: String = Util.makeDescriptionId("enchantment", key.location())
31+
add(translationKey, value)
32+
add("$translationKey.desc", desc)
3133
}
3234

3335
fun LanguageProvider.add(machine: HTMachineType, value: String, desc: String = "") {

‎src/main/kotlin/hiiragi283/ragium/api/tag/RagiumItemTags.kt

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ object RagiumItemTags {
3838

3939
// Ragium //
4040

41+
@JvmField
42+
val CAPACITY_ENCHANTABLE: TagKey<Item> = itemTagKey(RagiumAPI.id("enchantable/capacity"))
43+
4144
@JvmField
4245
val LED_BLOCKS: TagKey<Item> = itemTagKey(RagiumAPI.id("led_blocks"))
4346

‎src/main/kotlin/hiiragi283/ragium/common/block/machine/HTDisenchantingTableBlockEntity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class HTDisenchantingTableBlockEntity(pos: BlockPos, state: BlockState) :
117117
containerId,
118118
playerInventory,
119119
blockPos,
120-
CombinedInvWrapper(ticketInput, toolInput, bookInput)
120+
CombinedInvWrapper(ticketInput, toolInput, bookInput),
121121
)
122122

123123
override fun getDisplayName(): Component = RagiumBlocks.DISENCHANTING_TABLE.get().name

‎src/main/kotlin/hiiragi283/ragium/common/init/RagiumEnchantments.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package hiiragi283.ragium.common.init
22

33
import hiiragi283.ragium.api.RagiumAPI
4-
import net.minecraft.core.registries.BuiltInRegistries
4+
import hiiragi283.ragium.api.tag.RagiumItemTags
55
import net.minecraft.core.registries.Registries
66
import net.minecraft.data.worldgen.BootstrapContext
77
import net.minecraft.resources.ResourceKey
88
import net.minecraft.world.entity.EquipmentSlotGroup
99
import net.minecraft.world.item.enchantment.Enchantment
10-
import net.neoforged.neoforge.registries.holdersets.AnyHolderSet
1110

1211
object RagiumEnchantments {
1312
@JvmField
@@ -26,7 +25,7 @@ object RagiumEnchantments {
2625
CAPACITY,
2726
Enchantment.enchantment(
2827
Enchantment.definition(
29-
AnyHolderSet(BuiltInRegistries.ITEM.asLookup()),
28+
context.lookup(Registries.ITEM).getOrThrow(RagiumItemTags.CAPACITY_ENCHANTABLE),
3029
1,
3130
5,
3231
Enchantment.constantCost(1),

‎src/main/kotlin/hiiragi283/ragium/common/internal/RagiumConfig.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package hiiragi283.ragium.common.internal
22

33
import hiiragi283.ragium.api.material.HTMaterialKey
44
import net.neoforged.neoforge.common.ModConfigSpec
5+
import kotlin.math.abs
56

67
@Suppress("DEPRECATION")
78
internal object RagiumConfig {
@@ -32,7 +33,7 @@ internal object RagiumConfig {
3233
val value: Int = STIRLING_WATER_MODIFIER.get()
3334
return when {
3435
value > 0 -> burnTime * value
35-
value < 0 -> burnTime / value
36+
value < 0 -> burnTime / abs(value)
3637
else -> 0
3738
}
3839
}
@@ -45,7 +46,7 @@ internal object RagiumConfig {
4546
val value: Int = STIRLING_ASH_MODIFIER.get()
4647
return when {
4748
value > 0 -> burnTime * value
48-
value < 0 -> burnTime / value
49+
value < 0 -> burnTime / abs(value)
4950
else -> 0
5051
}
5152
}
@@ -58,7 +59,7 @@ internal object RagiumConfig {
5859
val value: Int = STIRLING_ASH_MODIFIER.get()
5960
return when {
6061
value > 0 -> burnTime * value
61-
value < 0 -> burnTime / value
62+
value < 0 -> burnTime / abs(value)
6263
else -> 0
6364
}
6465
}

‎src/main/kotlin/hiiragi283/ragium/data/RagiumData.kt

+8-7
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,14 @@ object RagiumData {
7272
provider,
7373
),
7474
)
75+
76+
generator.addProvider(event.includeServer(), RagiumDataMapProvider(output, provider))
77+
generator.addProvider(event.includeServer(), RagiumRecipeProvider(output, provider))
78+
79+
generator.addProvider(event.includeServer(), RagiumBlockTagProvider(output, provider, helper))
80+
generator.addProvider(event.includeServer(), RagiumFluidTagProvider(output, provider, helper))
81+
generator.addProvider(event.includeServer(), RagiumItemTagProvider(output, provider, helper))
82+
7583
generator.addProvider(
7684
event.includeServer(),
7785
DatapackBuiltinEntriesProvider(
@@ -85,13 +93,6 @@ object RagiumData {
8593
setOf(RagiumAPI.MOD_ID),
8694
),
8795
)
88-
89-
generator.addProvider(event.includeServer(), RagiumDataMapProvider(output, provider))
90-
generator.addProvider(event.includeServer(), RagiumRecipeProvider(output, provider))
91-
92-
generator.addProvider(event.includeServer(), RagiumBlockTagProvider(output, provider, helper))
93-
generator.addProvider(event.includeServer(), RagiumFluidTagProvider(output, provider, helper))
94-
generator.addProvider(event.includeServer(), RagiumItemTagProvider(output, provider, helper))
9596
// client
9697
generator.addProvider(event.includeClient(), ::RagiumEnglishProvider)
9798
generator.addProvider(event.includeClient(), ::RagiumJapaneseProvider)

‎src/main/kotlin/hiiragi283/ragium/data/client/RagiumEnglishProvider.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class RagiumEnglishProvider(output: PackOutput) : LanguageProvider(output, Ragiu
6666
add(HTOreVariant.NETHER, "Nether %s Ore")
6767
add(HTOreVariant.END, "End %s Ore")
6868
// Enchantment
69-
addEnchantment(RagiumEnchantments.CAPACITY, "Capacity")
69+
addEnchantment(RagiumEnchantments.CAPACITY, "Capacity", "Increase the capacity of item or fluid storages")
7070
// Fluids
7171
addFluid(RagiumFluids.HONEY, "Honey")
7272
addFluid(RagiumFluids.SNOW, "Powder Snow")

‎src/main/kotlin/hiiragi283/ragium/data/client/RagiumJapaneseProvider.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class RagiumJapaneseProvider(output: PackOutput) : LanguageProvider(output, Ragi
6868
add(HTOreVariant.NETHER, "ネザー%s鉱石")
6969
add(HTOreVariant.END, "エンド%s鉱石")
7070
// Enchantment
71-
addEnchantment(RagiumEnchantments.CAPACITY, "容量増加")
71+
addEnchantment(RagiumEnchantments.CAPACITY, "容量増加", "アイテムや液体ストレージの容量を拡張します")
7272
// Fluids
7373
addFluid(RagiumFluids.HONEY, "蜂蜜")
7474
addFluid(RagiumFluids.SNOW, "粉雪")

‎src/main/kotlin/hiiragi283/ragium/data/server/RagiumItemTagProvider.kt

+10
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import hiiragi283.ragium.api.extension.asHolder
88
import hiiragi283.ragium.api.extension.commonId
99
import hiiragi283.ragium.api.extension.forEach
1010
import hiiragi283.ragium.api.extension.itemTagKey
11+
import hiiragi283.ragium.api.machine.HTMachineType
1112
import hiiragi283.ragium.api.material.HTMaterialKey
1213
import hiiragi283.ragium.api.material.HTTagPrefix
1314
import hiiragi283.ragium.api.material.keys.CommonMaterials
@@ -172,5 +173,14 @@ class RagiumItemTagProvider(
172173
builder.add(RagiumItemTags.WIRE_MOLDS, RagiumItems.getPressMold(HTTagPrefix.WIRE))
173174

174175
RagiumBlocks.LED_BLOCKS.values.forEach { builder.add(RagiumItemTags.LED_BLOCKS, it.asHolder()) }
176+
177+
buildList {
178+
add(RagiumBlocks.MANUAL_GRINDER)
179+
add(RagiumBlocks.PRIMITIVE_BLAST_FURNACE)
180+
181+
add(RagiumBlocks.COPPER_DRUM)
182+
183+
addAll(HTMachineType.getBlocks())
184+
}.forEach { builder.add(RagiumItemTags.CAPACITY_ENCHANTABLE, it.asHolder()) }
175185
}
176186
}

0 commit comments

Comments
 (0)