Skip to content

Commit 40fdc30

Browse files
committed
Fixed issues with world converter caused by being sleepy at the time.
1 parent cab8866 commit 40fdc30

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

common/src/main/java/generations/gg/generations/core/generationscore/common/datafixer/GenerationsSchemas.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ object GenerationsSchemas {
4545
val builder = DataFixerBuilder(DATA_VERSION)
4646
this.appendSchemas(builder)
4747
val types = hashSetOf<DSL.TypeReference>(
48-
References.ENTITY ,
49-
GenerationsReferences.TERRAIUM_FORGE_INVENTORY,
50-
GenerationsReferences.TERRAIUM_FABRIC_INVENTORY)
48+
References.ENTITY)
5149

5250
val result = builder.build()
5351
if (types.isEmpty()) {

common/src/main/java/generations/gg/generations/core/generationscore/common/datafixer/schema/GenerationsReferences.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,5 @@ import net.minecraft.util.datafix.fixes.References
44
import net.minecraft.world.entity.player.Inventory
55

66
object GenerationsReferences {
7-
val TERRAIUM_FORGE_INVENTORY = References.reference("terraium_forge_inventory")
8-
val ITEM_RESOURCE = References.reference("item_resource")
9-
val TERRAIUM_FABRIC_INVENTORY = References.reference("terraium_fabric_inventory")
10-
val INVENTORY = References.reference("inventory")
7+
118
}

common/src/main/java/generations/gg/generations/core/generationscore/common/datafixer/schema/GenerationsRootSchema.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class GenerationsRootSchema(versionKey: Int, parent: Schema?) : Schema(versionKe
7777
else -> throw RuntimeException("Forge isn't supported by Generations Core")
7878
}
7979

80-
val inventory: () -> TypeTemplate = { GenerationsReferences.INVENTORY.`in`(schema) }
80+
val inventory: () -> TypeTemplate = { DSL.optionalFields("Items", DSL.list(References.ITEM_STACK.`in`(schema))) }
8181

8282
simple("pokedoll")
8383
simple("generic_shrine")

common/src/main/java/generations/gg/generations/core/generationscore/common/datafixer/schema/Generationsv1Schema.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package generations.gg.generations.core.generationscore.common.datafixer.schema
22

3+
import com.google.common.collect.Maps
34
import com.mojang.datafixers.DSL
45
import com.mojang.datafixers.schemas.Schema
56
import com.mojang.datafixers.types.templates.TypeTemplate
@@ -24,7 +25,7 @@ class Generationsv1Schema(versionKey: Int, parent: Schema) : Schema(versionKey,
2425
}
2526

2627
override fun registerBlockEntities(schema: Schema): MutableMap<String, Supplier<TypeTemplate>> {
27-
return schema.registerBlockEntities(schema).apply {
28+
return mutableMapOf<String, Supplier<TypeTemplate>>().apply {
2829
putGens("regigigas_shrine") { DSL.optionalFields("Items", DSL.list(References.ITEM_STACK.`in`(schema))) }
2930
putGens("cooking_pot") { DSL.optionalFields("Items", DSL.list(References.ITEM_STACK.`in`(schema))) }
3031
}

0 commit comments

Comments
 (0)