Skip to content

Commit eb0a826

Browse files
committed
Fixes RKS machine recipe matching with no aspects in time capsule ingredient.
1 parent 666e5c8 commit eb0a826

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

common/src/main/java/generations/gg/generations/core/generationscore/common/network/packets/C2SToggleHandler.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import net.minecraft.server.level.ServerPlayer
99
object C2SToggleHandler : ServerNetworkPacketHandler<C2STogglePacket> {
1010
override fun handle(packet: C2STogglePacket, minecraftServer: MinecraftServer, player: ServerPlayer) {
1111
player.containerMenu.instanceOrNull<Toggleable>()?.run {
12-
System.out.println("Hoi I'm a debugger!")
13-
1412
isToggled = !isToggled
1513
}
1614
}

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/RksMachineBlockEntity.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ open class RksMachineBlockEntity(pos: BlockPos, state: BlockState) :
7979
when (index) {
8080
2 -> this@RksMachineBlockEntity.isProcessing = value == 1
8181
}
82-
this@RksMachineBlockEntity.setChanged()
82+
this@RksMachineBlockEntity.sync()
8383
}
8484

8585
override fun getCount(): Int {
@@ -220,8 +220,7 @@ open class RksMachineBlockEntity(pos: BlockPos, state: BlockState) :
220220

221221
if (lastRecipe != null) {
222222
val mapRecipe = getMappedRecipe(manager, lastRecipe.id())
223-
if (mapRecipe.map { obj: RecipeHolder<RksRecipe> -> obj.value() }
224-
.filter { a: RksRecipe -> a.matches(craftingInput, level) }.isPresent
223+
if (mapRecipe.map { obj: RecipeHolder<RksRecipe> -> obj.value() }.filter { a: RksRecipe -> a.matches(craftingInput, level) }.isPresent
225224
) {
226225
return Optional.of(lastRecipe)
227226
}

common/src/main/java/generations/gg/generations/core/generationscore/common/world/recipe/TimeCapsuleIngredient.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ class TimeCapsuleIngredient(val key : SpeciesKey, val strictAspects: Boolean = f
3333
override val type: GenerationsIngredientType<*>
3434
get() = GenerationsIngredidents.TIME_CAPSULE
3535

36-
override fun matches(stack: ItemStack): Boolean = if(stack.`is`(GenerationsItems.TIME_CAPSULE)) stack.getPokemon()?.takeIf { it.species.resourceIdentifier == key.species && if(strictAspects) it.aspects == key.aspects else it.aspects.containsAny(key.aspects) } != null else false
36+
override fun matches(stack: ItemStack): Boolean {
37+
return if (stack.`is`(GenerationsItems.TIME_CAPSULE)) stack.getPokemon()?.takeIf {
38+
it.species.resourceIdentifier == key.species && if(key.aspects.isEmpty()) true else if (strictAspects) it.aspects == key.aspects else it.aspects.containsAny(key.aspects)
39+
} != null else false
40+
}
3741
override fun matchingStacks(): List<ItemStack> = listOf(PokemonSpecies.getByIdentifier(key.species)?.let { PokemonItem.from(it, key.aspects ?: emptySet(), 1) }?: Items.APPLE.defaultInstance.also { it.set(DataComponents.ITEM_NAME, Component.literal("Missing species: " + key.species )) } )
3842

3943
companion object {

0 commit comments

Comments
 (0)