Skip to content

Commit 0fc0606

Browse files
committed
refactor: update OpiniumCoreContentsComponent structure and usage
1 parent 02a52e0 commit 0fc0606

3 files changed

Lines changed: 13 additions & 7 deletions

File tree

src/main/kotlin/dev/aaronhowser/mods/excessive_utilities/client/render/bewlr/OpiniumCoreBEWLR.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ class OpiniumCoreBEWLR : BlockEntityWithoutLevelRenderer(
2929
) {
3030
val component = stack.get(ModDataComponents.OPINIUM_CORE_CONTENTS) ?: return
3131

32-
val (inner, outer) = component
32+
val center = component.getCenter()
33+
val outer = component.getOuter()
3334

3435
val gameTime = AaronClientUtil.localLevel?.gameTime ?: 0
3536
val time = gameTime + Minecraft.getInstance().timer.gameTimeDeltaTicks
3637

37-
renderInner(inner, poseStack, buffer, displayContext, packedLight, packedOverlay, time)
38+
renderInner(center, poseStack, buffer, displayContext, packedLight, packedOverlay, time)
3839
renderOuters(outer, poseStack, buffer, displayContext, packedLight, packedOverlay, time)
3940
}
4041

src/main/kotlin/dev/aaronhowser/mods/excessive_utilities/datagen/recipe/ModRecipeProvider.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,16 @@ class ModRecipeProvider(
106106
val inputComponent = cores[i - 1]
107107
val outputComponent = core
108108

109-
val (inner, outer) = core
109+
val center = core.getCenter()
110+
val outer = core.getOuter()
110111

111112
shapedRecipe(
112113
outputComponent.getStack(),
113114
" O ,ABA, O ",
114115
mapOf(
115116
'O' to ingredient(inputComponent),
116117
'A' to outer.asIngredient(),
117-
'B' to inner.asIngredient()
118+
'B' to center.asIngredient()
118119
)
119120
).save(recipeOutput, modLoc(recipeName))
120121
}

src/main/kotlin/dev/aaronhowser/mods/excessive_utilities/item/component/OpiniumCoreContentsComponent.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@ import net.minecraft.world.item.ItemStack
1616
import net.minecraft.world.item.Items
1717

1818
data class OpiniumCoreContentsComponent(
19-
val center: ItemStack,
20-
val outer: ItemStack,
19+
private val center: ItemStack,
20+
private val outer: ItemStack,
2121
val name: Component
2222
) {
2323

24-
fun getStack(): ItemStack = ModItems.OPINIUM_CORE.withComponent(ModDataComponents.OPINIUM_CORE_CONTENTS.get(), this)
24+
fun getStack(): ItemStack = ModItems.OPINIUM_CORE
25+
.withComponent(ModDataComponents.OPINIUM_CORE_CONTENTS.get(), this)
26+
27+
fun getCenter(): ItemStack = center.copy()
28+
fun getOuter(): ItemStack = outer.copy()
2529

2630
override fun equals(other: Any?): Boolean {
2731
if (this === other) return true

0 commit comments

Comments
 (0)