Skip to content

Commit 722fafc

Browse files
lhnslhns
committed
fixed deprecations in forge ports
1 parent 561fc6c commit 722fafc

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object FluidPhysicsMod {
2121
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(container.getModId)
2222

2323
val SPRING_BLOCK_ID = new ResourceLocation(container.getModId, "spring")
24-
val SPRING_BLOCK: Block = new SpringBlock(AbstractBlock.Properties.create(Material.ROCK).func_235861_h_().hardnessAndResistance(2.0F, 6.0F)).setRegistryName(SPRING_BLOCK_ID) //new SpringBlock(FabricBlockSettings.of(Material.STONE).requiresTool().hardness(2.0F).resistance(6.0F))
24+
val SPRING_BLOCK: Block = new SpringBlock(AbstractBlock.Properties.create(Material.ROCK).func_235861_h_().hardnessAndResistance(2.0F, 6.0F)).setRegistryName(SPRING_BLOCK_ID)
2525

2626
FMLJavaModLoadingContext.get.getModEventBus.addListener { _: FMLCommonSetupEvent =>
2727
config

‎forge-1.16.1/src/main/scala/de/lolhens/minecraft/fluidphysics/config/FluidPhysicsConfig.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ import net.minecraft.block.Block
77
import net.minecraft.fluid.{Fluid, Fluids}
88
import net.minecraft.util.ResourceLocation
99
import net.minecraft.util.math.BlockPos
10-
import net.minecraft.util.registry.Registry
1110
import net.minecraft.world.World
1211
import net.minecraft.world.biome.Biome
12+
import net.minecraftforge.registries.{ForgeRegistries, IForgeRegistry, IForgeRegistryEntry}
1313

14-
case class FluidPhysicsConfig(fluidWhitelist: Seq[ResourceLocation] = Seq(Fluids.WATER, Fluids.LAVA).map(Registry.FLUID.getKey),
14+
case class FluidPhysicsConfig(fluidWhitelist: Seq[ResourceLocation] = Seq(Fluids.WATER, Fluids.LAVA).map(ForgeRegistries.FLUIDS.getKey),
1515
findSourceMaxIterations: Int = 255,
1616
biomeDependentFluidInfinity: Boolean = false,
1717
flowOverSources: Boolean = true,
1818
debugFluidState: Boolean = false,
1919
spring: Option[SpringConfig] = Some(SpringConfig()),
2020
rainRefill: Option[RainRefillConfig] = Some(RainRefillConfig())) {
21-
lazy val getFluidWhitelist: Seq[Fluid] = fluidWhitelist.map(registryGet(Registry.FLUID, _))
21+
lazy val getFluidWhitelist: Seq[Fluid] = fluidWhitelist.map(registryGet(ForgeRegistries.FLUIDS, _))
2222

2323
def enabledFor(fluid: Fluid): Boolean = getFluidWhitelist.exists(_.isEquivalentTo(fluid))
2424
}
@@ -28,24 +28,24 @@ object FluidPhysicsConfig extends Config[FluidPhysicsConfig] {
2828

2929
override protected def codec: Codec[FluidPhysicsConfig] = makeCodec
3030

31-
private def registryGet[A](registry: Registry[A], id: ResourceLocation): A = {
31+
private def registryGet[A <: IForgeRegistryEntry[A]](registry: IForgeRegistry[A], id: ResourceLocation): A = {
3232
require(registry.containsKey(id), "Registry does not contain identifier: " + id)
33-
registry.getOrDefault(id)
33+
registry.getValue(id)
3434
}
3535

3636
case class SpringConfig(block: ResourceLocation = FluidPhysicsMod.SPRING_BLOCK_ID,
3737
updateBlocksInWorld: Boolean = false,
3838
allowInfiniteWater: Boolean = true) {
39-
lazy val getBlock: Block = registryGet(Registry.BLOCK, block)
39+
lazy val getBlock: Block = registryGet(ForgeRegistries.BLOCKS, block)
4040

4141
def shouldUpdateBlocksInWorld: Boolean =
4242
block != FluidPhysicsMod.SPRING_BLOCK_ID && updateBlocksInWorld
4343
}
4444

4545
case class RainRefillConfig(probability: Double = 0.2,
46-
fluidWhitelist: Seq[ResourceLocation] = Seq(Fluids.WATER).map(Registry.FLUID.getKey),
46+
fluidWhitelist: Seq[ResourceLocation] = Seq(Fluids.WATER).map(ForgeRegistries.FLUIDS.getKey),
4747
biomeDependent: Boolean = true) {
48-
lazy val getFluidWhitelist: Seq[Fluid] = fluidWhitelist.map(registryGet(Registry.FLUID, _))
48+
lazy val getFluidWhitelist: Seq[Fluid] = fluidWhitelist.map(registryGet(ForgeRegistries.FLUIDS, _))
4949

5050
def canRefillFluid(fluid: Fluid): Boolean = getFluidWhitelist.exists(_.isEquivalentTo(fluid))
5151

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object FluidPhysicsMod {
2121
lazy val config: FluidPhysicsConfig = FluidPhysicsConfig.loadOrCreate(container.getModId)
2222

2323
val SPRING_BLOCK_ID = new ResourceLocation(container.getModId, "spring")
24-
val SPRING_BLOCK: Block = new SpringBlock(AbstractBlock.Properties.create(Material.ROCK).func_235861_h_().hardnessAndResistance(2.0F, 6.0F)).setRegistryName(SPRING_BLOCK_ID) //new SpringBlock(FabricBlockSettings.of(Material.STONE).requiresTool().hardness(2.0F).resistance(6.0F))
24+
val SPRING_BLOCK: Block = new SpringBlock(AbstractBlock.Properties.create(Material.ROCK).func_235861_h_().hardnessAndResistance(2.0F, 6.0F)).setRegistryName(SPRING_BLOCK_ID)
2525

2626
FMLJavaModLoadingContext.get.getModEventBus.addListener { _: FMLCommonSetupEvent =>
2727
config

‎forge-1.16.2/src/main/scala/de/lolhens/minecraft/fluidphysics/config/FluidPhysicsConfig.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ import net.minecraft.block.Block
77
import net.minecraft.fluid.{Fluid, Fluids}
88
import net.minecraft.util.ResourceLocation
99
import net.minecraft.util.math.BlockPos
10-
import net.minecraft.util.registry.Registry
1110
import net.minecraft.world.World
1211
import net.minecraft.world.biome.Biome
12+
import net.minecraftforge.registries.{ForgeRegistries, IForgeRegistry, IForgeRegistryEntry}
1313

14-
case class FluidPhysicsConfig(fluidWhitelist: Seq[ResourceLocation] = Seq(Fluids.WATER, Fluids.LAVA).map(Registry.FLUID.getKey),
14+
case class FluidPhysicsConfig(fluidWhitelist: Seq[ResourceLocation] = Seq(Fluids.WATER, Fluids.LAVA).map(ForgeRegistries.FLUIDS.getKey),
1515
findSourceMaxIterations: Int = 255,
1616
biomeDependentFluidInfinity: Boolean = false,
1717
flowOverSources: Boolean = true,
1818
debugFluidState: Boolean = false,
1919
spring: Option[SpringConfig] = Some(SpringConfig()),
2020
rainRefill: Option[RainRefillConfig] = Some(RainRefillConfig())) {
21-
lazy val getFluidWhitelist: Seq[Fluid] = fluidWhitelist.map(registryGet(Registry.FLUID, _))
21+
lazy val getFluidWhitelist: Seq[Fluid] = fluidWhitelist.map(registryGet(ForgeRegistries.FLUIDS, _))
2222

2323
def enabledFor(fluid: Fluid): Boolean = getFluidWhitelist.exists(_.isEquivalentTo(fluid))
2424
}
@@ -28,24 +28,24 @@ object FluidPhysicsConfig extends Config[FluidPhysicsConfig] {
2828

2929
override protected def codec: Codec[FluidPhysicsConfig] = makeCodec
3030

31-
private def registryGet[A](registry: Registry[A], id: ResourceLocation): A = {
31+
private def registryGet[A <: IForgeRegistryEntry[A]](registry: IForgeRegistry[A], id: ResourceLocation): A = {
3232
require(registry.containsKey(id), "Registry does not contain identifier: " + id)
33-
registry.getOrDefault(id)
33+
registry.getValue(id)
3434
}
3535

3636
case class SpringConfig(block: ResourceLocation = FluidPhysicsMod.SPRING_BLOCK_ID,
3737
updateBlocksInWorld: Boolean = false,
3838
allowInfiniteWater: Boolean = true) {
39-
lazy val getBlock: Block = registryGet(Registry.BLOCK, block)
39+
lazy val getBlock: Block = registryGet(ForgeRegistries.BLOCKS, block)
4040

4141
def shouldUpdateBlocksInWorld: Boolean =
4242
block != FluidPhysicsMod.SPRING_BLOCK_ID && updateBlocksInWorld
4343
}
4444

4545
case class RainRefillConfig(probability: Double = 0.2,
46-
fluidWhitelist: Seq[ResourceLocation] = Seq(Fluids.WATER).map(Registry.FLUID.getKey),
46+
fluidWhitelist: Seq[ResourceLocation] = Seq(Fluids.WATER).map(ForgeRegistries.FLUIDS.getKey),
4747
biomeDependent: Boolean = true) {
48-
lazy val getFluidWhitelist: Seq[Fluid] = fluidWhitelist.map(registryGet(Registry.FLUID, _))
48+
lazy val getFluidWhitelist: Seq[Fluid] = fluidWhitelist.map(registryGet(ForgeRegistries.FLUIDS, _))
4949

5050
def canRefillFluid(fluid: Fluid): Boolean = getFluidWhitelist.exists(_.isEquivalentTo(fluid))
5151

0 commit comments

Comments
 (0)