Skip to content

Commit 3597c52

Browse files
lhnslhns
committed
remove modId fabric hack
1 parent 63c8863 commit 3597c52

File tree

5 files changed

+15
-50
lines changed

5 files changed

+15
-50
lines changed

‎fabric-1.15.2/src/main/scala/de/lolhens/minecraft/fluidphysics/FluidPhysicsMod.scala

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,17 @@ import de.lolhens.minecraft.fluidphysics.config.FluidPhysicsConfig
66
import de.lolhens.minecraft.fluidphysics.util.RainRefill
77
import net.fabricmc.api.ModInitializer
88
import net.fabricmc.fabric.api.`object`.builder.v1.block.FabricBlockSettings
9-
import net.fabricmc.loader.api.FabricLoader
10-
import net.fabricmc.loader.api.metadata.ModMetadata
119
import net.minecraft.block.{Block, Material}
1210
import net.minecraft.item.{BlockItem, Item, ItemGroup}
1311
import net.minecraft.util.Identifier
1412
import net.minecraft.util.registry.Registry
1513

16-
import scala.jdk.CollectionConverters._
17-
1814
object FluidPhysicsMod extends ModInitializer {
19-
val metadata: ModMetadata = {
20-
FabricLoader.getInstance().getEntrypointContainers("main", classOf[ModInitializer])
21-
.iterator().asScala.find(this eq _.getEntrypoint).get.getProvider.getMetadata
22-
}
15+
val id: String = "fluidphysics"
2316

24-
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(metadata.getId)
17+
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(id)
2518

26-
val SPRING_BLOCK_ID = new Identifier(metadata.getId, "spring")
19+
val SPRING_BLOCK_ID = new Identifier(id, "spring")
2720
val SPRING_BLOCK: Block = new SpringBlock(FabricBlockSettings.of(Material.STONE).hardness(2.0F).resistance(6.0F))
2821

2922
override def onInitialize(): Unit = {

‎fabric-1.16.1/src/main/scala/de/lolhens/minecraft/fluidphysics/FluidPhysicsMod.scala

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,17 @@ import de.lolhens.minecraft.fluidphysics.config.FluidPhysicsConfig
66
import de.lolhens.minecraft.fluidphysics.util.RainRefill
77
import net.fabricmc.api.ModInitializer
88
import net.fabricmc.fabric.api.`object`.builder.v1.block.FabricBlockSettings
9-
import net.fabricmc.loader.api.FabricLoader
10-
import net.fabricmc.loader.api.metadata.ModMetadata
119
import net.minecraft.block.{Block, Material}
1210
import net.minecraft.item.{BlockItem, Item, ItemGroup}
1311
import net.minecraft.util.Identifier
1412
import net.minecraft.util.registry.Registry
1513

16-
import scala.jdk.CollectionConverters._
17-
1814
object FluidPhysicsMod extends ModInitializer {
19-
val metadata: ModMetadata = {
20-
FabricLoader.getInstance().getEntrypointContainers("main", classOf[ModInitializer])
21-
.iterator().asScala.find(this eq _.getEntrypoint).get.getProvider.getMetadata
22-
}
15+
val id: String = "fluidphysics"
2316

24-
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(metadata.getId)
17+
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(id)
2518

26-
val SPRING_BLOCK_ID = new Identifier(metadata.getId, "spring")
19+
val SPRING_BLOCK_ID = new Identifier(id, "spring")
2720
val SPRING_BLOCK: Block = new SpringBlock(FabricBlockSettings.of(Material.STONE).requiresTool().hardness(2.0F).resistance(6.0F))
2821

2922
override def onInitialize(): Unit = {

‎fabric-1.16.2/src/main/scala/de/lolhens/minecraft/fluidphysics/FluidPhysicsMod.scala

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,17 @@ import de.lolhens.minecraft.fluidphysics.config.FluidPhysicsConfig
66
import de.lolhens.minecraft.fluidphysics.util.RainRefill
77
import net.fabricmc.api.ModInitializer
88
import net.fabricmc.fabric.api.`object`.builder.v1.block.FabricBlockSettings
9-
import net.fabricmc.loader.api.FabricLoader
10-
import net.fabricmc.loader.api.metadata.ModMetadata
119
import net.minecraft.block.{Block, Material}
1210
import net.minecraft.item.{BlockItem, Item, ItemGroup}
1311
import net.minecraft.util.Identifier
1412
import net.minecraft.util.registry.Registry
1513

16-
import scala.jdk.CollectionConverters._
17-
1814
object FluidPhysicsMod extends ModInitializer {
19-
val metadata: ModMetadata = {
20-
FabricLoader.getInstance().getEntrypointContainers("main", classOf[ModInitializer])
21-
.iterator().asScala.find(this eq _.getEntrypoint).get.getProvider.getMetadata
22-
}
15+
val id: String = "fluidphysics"
2316

24-
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(metadata.getId)
17+
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(id)
2518

26-
val SPRING_BLOCK_ID = new Identifier(metadata.getId, "spring")
19+
val SPRING_BLOCK_ID = new Identifier(id, "spring")
2720
val SPRING_BLOCK: Block = new SpringBlock(FabricBlockSettings.of(Material.STONE).requiresTool().hardness(2.0F).resistance(6.0F))
2821

2922
override def onInitialize(): Unit = {

‎fabric-1.16.4/src/main/scala/de/lolhens/minecraft/fluidphysics/FluidPhysicsMod.scala

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,17 @@ import de.lolhens.minecraft.fluidphysics.config.FluidPhysicsConfig
66
import de.lolhens.minecraft.fluidphysics.util.RainRefill
77
import net.fabricmc.api.ModInitializer
88
import net.fabricmc.fabric.api.`object`.builder.v1.block.FabricBlockSettings
9-
import net.fabricmc.loader.api.FabricLoader
10-
import net.fabricmc.loader.api.metadata.ModMetadata
119
import net.minecraft.block.{Block, Material}
1210
import net.minecraft.item.{BlockItem, Item, ItemGroup}
1311
import net.minecraft.util.Identifier
1412
import net.minecraft.util.registry.Registry
1513

16-
import scala.jdk.CollectionConverters._
17-
1814
object FluidPhysicsMod extends ModInitializer {
19-
val metadata: ModMetadata = {
20-
FabricLoader.getInstance().getEntrypointContainers("main", classOf[ModInitializer])
21-
.iterator().asScala.find(this eq _.getEntrypoint).get.getProvider.getMetadata
22-
}
15+
val id: String = "fluidphysics"
2316

24-
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(metadata.getId)
17+
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(id)
2518

26-
val SPRING_BLOCK_ID = new Identifier(metadata.getId, "spring")
19+
val SPRING_BLOCK_ID = new Identifier(id, "spring")
2720
val SPRING_BLOCK: Block = new SpringBlock(FabricBlockSettings.of(Material.STONE).requiresTool().hardness(2.0F).resistance(6.0F))
2821

2922
override def onInitialize(): Unit = {

‎fabric-1.17/src/main/scala/de/lolhens/minecraft/fluidphysics/FluidPhysicsMod.scala

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,17 @@ import de.lolhens.minecraft.fluidphysics.config.FluidPhysicsConfig
66
import de.lolhens.minecraft.fluidphysics.util.RainRefill
77
import net.fabricmc.api.ModInitializer
88
import net.fabricmc.fabric.api.`object`.builder.v1.block.FabricBlockSettings
9-
import net.fabricmc.loader.api.FabricLoader
10-
import net.fabricmc.loader.api.metadata.ModMetadata
119
import net.minecraft.block.{Block, Material}
1210
import net.minecraft.item.{BlockItem, Item, ItemGroup}
1311
import net.minecraft.util.Identifier
1412
import net.minecraft.util.registry.Registry
1513

16-
import scala.jdk.CollectionConverters._
17-
1814
object FluidPhysicsMod extends ModInitializer {
19-
val metadata: ModMetadata = {
20-
FabricLoader.getInstance().getEntrypointContainers("main", classOf[ModInitializer])
21-
.iterator().asScala.find(this eq _.getEntrypoint).get.getProvider.getMetadata
22-
}
15+
val id: String = "fluidphysics"
2316

24-
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(metadata.getId)
17+
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(id)
2518

26-
val SPRING_BLOCK_ID = new Identifier(metadata.getId, "spring")
19+
val SPRING_BLOCK_ID = new Identifier(id, "spring")
2720
val SPRING_BLOCK: Block = new SpringBlock(FabricBlockSettings.of(Material.STONE).requiresTool().hardness(2.0F).resistance(6.0F))
2821

2922
override def onInitialize(): Unit = {

0 commit comments

Comments
 (0)