diff --git a/pom.xml b/pom.xml
index 72d8fb4..f8de983 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
UTF-8
official
1.8
- 21w08a
+ 21w11a
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt
index 16338b1..e1b66d6 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt
@@ -343,7 +343,6 @@ object BlockGenerator : Generator(
val pair = Pair(VOXEL_SHAPES.size, voxelShape)
VOXEL_SHAPES[string] = pair
- println(voxelShape)
return pair.first
}
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt
index 1fb570e..6f6ff28 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt
@@ -77,14 +77,14 @@ object ItemGenerator : Generator(
}
if (item is AxeItem) {
- val stripables = JsonArray()
- (AXE_ITEM_STRIPABLES_FIELD.get(item) as Map?)?.toSortedMap { block: Block, block1: Block -> Registry.BLOCK.getId(block) - Registry.BLOCK.getId(block1) }?.let {
+ val strippables = JsonArray()
+ (AXE_ITEM_STRIPPABLES_FIELD.get(item) as Map?)?.toSortedMap { block: Block, block1: Block -> Registry.BLOCK.getId(block) - Registry.BLOCK.getId(block1) }?.let {
for ((_, block) in it) {
- stripables.add(Registry.BLOCK.getId(block))
+ strippables.add(Registry.BLOCK.getId(block))
}
}
- if (stripables.size() > 0) {
- itemData.add("stripables_blocks", stripables)
+ if (strippables.size() > 0) {
+ itemData.add("strippables_blocks", strippables)
}
}
if (item is BucketItem) {
@@ -175,7 +175,7 @@ object ItemGenerator : Generator(
private val DIGGER_ITEM_ATTACK_DAMAGE = getField(DiggerItem::class.java, "attackDamageBaseline", "attackDamage")!!
private val ARMOR_ITEM_EQUIPMENT_SLOT_FIELD = ArmorItem::class.java.getDeclaredField("slot")
private val ARMOR_ITEM_TOUGHNESS_FIELD = ArmorItem::class.java.getDeclaredField("toughness")
- private val AXE_ITEM_STRIPABLES_FIELD = AxeItem::class.java.getDeclaredField("STRIPABLES")
+ private val AXE_ITEM_STRIPPABLES_FIELD = getField(AxeItem::class.java, "STRIPABLES", "STRIPPABLES")!!
private val BUCKED_ITEM_CONTENT_FIELD = BucketItem::class.java.getDeclaredField("content")
private val MOB_BUCKED_ITEM_TYPE_FIELD = getField(MOB_BUCKED_ITEM_CLASS, "type")
private val MOB_BUCKED_ITEM_EMPTY_SOUND_FIELD = getField(MOB_BUCKED_ITEM_CLASS, "emptySound")
@@ -189,7 +189,7 @@ object ItemGenerator : Generator(
DIGGER_ITEM_SPEED_FIELD.isAccessible = true
ARMOR_ITEM_EQUIPMENT_SLOT_FIELD.isAccessible = true
ARMOR_ITEM_TOUGHNESS_FIELD.isAccessible = true
- AXE_ITEM_STRIPABLES_FIELD.isAccessible = true
+ AXE_ITEM_STRIPPABLES_FIELD.isAccessible = true
BUCKED_ITEM_CONTENT_FIELD.isAccessible = true
HOE_ITEM_TILLABLES_FIELD.isAccessible = true
SHOVEL_ITEM_FLATTENABLES_FIELD.isAccessible = true
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/VoxelShapeGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/VoxelShapeGenerator.kt
index aad6989..53cce85 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/VoxelShapeGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/VoxelShapeGenerator.kt
@@ -14,7 +14,6 @@ object VoxelShapeGenerator : Generator(
override fun generate() {
val shapes = JsonArray()
for ((_, shape) in BlockGenerator.VOXEL_SHAPES) {
- println("Shape ${shape.first}")
shapes.add(shape.second.serialize())
}
data.add("shapes", shapes)