Fix pickaxes not being an actual effective tool for stone ladders

Juuxel · Jul 5, 2021 · 524e9cf · 524e9cf
1 parent 96e2381
commit 524e9cf
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 26 deletions.
diff --git a/common/src/main/kotlin/juuxel/adorn/block/AdornBlocks.kt b/common/src/main/kotlin/juuxel/adorn/block/AdornBlocks.kt
@@ -311,7 +311,10 @@ object AdornBlocks {
         )
     }
     val STONE_LADDER: Block by registerBlock("stone_ladder") {
-        StoneLadderBlock(PlatformBridges.blocks.createStoneLadderSettings())
+        StoneLadderBlock(
+            AbstractBlock.Settings.copy(Blocks.STONE)
+                .nonOpaque()
+        )
     }
     // @formatter:on
 

diff --git a/common/src/main/kotlin/juuxel/adorn/platform/BlockBridge.kt b/common/src/main/kotlin/juuxel/adorn/platform/BlockBridge.kt
diff --git a/common/src/main/kotlin/juuxel/adorn/platform/PlatformBridges.kt b/common/src/main/kotlin/juuxel/adorn/platform/PlatformBridges.kt
@@ -8,7 +8,6 @@ fun PlatformBridges.Companion.get(): PlatformBridges =
     throw AssertionError("Untransformed ExpectPlatform")
 
 interface PlatformBridges {
-    val blocks: BlockBridge
     val blockEntities: BlockEntityDescriptors
     val config: CommonConfig
     val entities: EntityBridge
@@ -19,7 +18,6 @@ interface PlatformBridges {
     val tags: TagBridge
 
     companion object {
-        inline val blocks get() = get().blocks
         inline val blockEntities get() = get().blockEntities
         inline val config get() = get().config
         inline val entities get() = get().entities

diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "adorn:stone_ladder"
+  ]
+}
diff --git a/fabric/src/main/kotlin/juuxel/adorn/platform/fabric/BlockBridgeImpl.kt b/fabric/src/main/kotlin/juuxel/adorn/platform/fabric/BlockBridgeImpl.kt
diff --git a/fabric/src/main/kotlin/juuxel/adorn/platform/fabric/PlatformBridgesImpl.kt b/fabric/src/main/kotlin/juuxel/adorn/platform/fabric/PlatformBridgesImpl.kt
@@ -15,7 +15,6 @@ import net.minecraft.util.registry.Registry
 
 fun PlatformBridges.Companion.get(): PlatformBridges =
     object : PlatformBridges {
-        override val blocks = BlockBridgeImpl
         override val blockEntities = BlockEntityDescriptorsImpl
         override val config = ConfigManager.CONFIG
         override val entities = EntityBridgeImpl