remove debug statements, port to 21w11a

This commit is contained in:
Bixilon 2021-03-22 21:48:58 +01:00
parent f1bde0a49e
commit 0f9c580203
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 8 additions and 10 deletions

View File

@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin.code.style>official</kotlin.code.style>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<minecraft.version>21w08a</minecraft.version>
<minecraft.version>21w11a</minecraft.version>
</properties>
<repositories>

View File

@ -343,7 +343,6 @@ object BlockGenerator : Generator(
val pair = Pair(VOXEL_SHAPES.size, voxelShape)
VOXEL_SHAPES[string] = pair
println(voxelShape)
return pair.first
}

View File

@ -77,14 +77,14 @@ object ItemGenerator : Generator(
}
if (item is AxeItem) {
val stripables = JsonArray()
(AXE_ITEM_STRIPABLES_FIELD.get(item) as Map<Block, Block>?)?.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<Block, Block>?)?.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

View File

@ -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)