From 1c5599a2955501ac04e0dd3aa6a1061e727836b1 Mon Sep 17 00:00:00 2001 From: Waterpicker Date: Fri, 9 Dec 2022 02:58:03 -0600 Subject: [PATCH] LimboDecay --- .../java/org/dimdev/dimdoors/DimensionalDoors.java | 8 ++++---- .../org/dimdev/dimdoors/api/DimensionalDoorsApi.java | 3 +-- .../block/door/DimensionalDoorBlockRegistrar.java | 2 +- .../dimdoors/item/DimensionalDoorItemRegistrar.java | 5 +++-- .../dimdev/dimdoors/world/decay/DecayPredicate.java | 8 ++++---- .../dimdev/dimdoors/world/decay/DecayProcessor.java | 8 ++++---- .../org/dimdev/dimdoors/world/decay/LimboDecay.java | 2 +- .../decay/predicates/SimpleBlockDecayPredicate.java | 6 +++--- .../world/decay/processors/DoorDecayProccessor.java | 6 +++--- .../world/decay/processors/DoubleDecayProcessor.java | 6 +++--- .../world/decay/processors/SimpleDecayProcesor.java | 11 +++++++---- 11 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/dimdev/dimdoors/DimensionalDoors.java b/src/main/java/org/dimdev/dimdoors/DimensionalDoors.java index 381c6802..eac45f81 100644 --- a/src/main/java/org/dimdev/dimdoors/DimensionalDoors.java +++ b/src/main/java/org/dimdev/dimdoors/DimensionalDoors.java @@ -13,12 +13,12 @@ import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; +import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryKey; import net.minecraft.resource.ResourceType; import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.World; import org.dimdev.dimdoors.api.DimensionalDoorsApi; import org.dimdev.dimdoors.api.event.UseItemOnBlockCallback; @@ -136,8 +136,8 @@ public class DimensionalDoors implements ModInitializer { ModParticleTypes.init(); ModCriteria.init(); ModEnchants.init(); - dimensionalDoorItemRegistrar = new DimensionalDoorItemRegistrar(Registry.ITEM); - dimensionalDoorBlockRegistrar = new DimensionalDoorBlockRegistrar(Registry.BLOCK, dimensionalDoorItemRegistrar); + dimensionalDoorItemRegistrar = new DimensionalDoorItemRegistrar(Registries.ITEM); + dimensionalDoorBlockRegistrar = new DimensionalDoorBlockRegistrar(Registries.BLOCK, dimensionalDoorItemRegistrar); ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(PocketLoader.getInstance()); ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(LimboDecay.DecayLoader.getInstance()); diff --git a/src/main/java/org/dimdev/dimdoors/api/DimensionalDoorsApi.java b/src/main/java/org/dimdev/dimdoors/api/DimensionalDoorsApi.java index ad4c61fc..1edd3c44 100644 --- a/src/main/java/org/dimdev/dimdoors/api/DimensionalDoorsApi.java +++ b/src/main/java/org/dimdev/dimdoors/api/DimensionalDoorsApi.java @@ -1,5 +1,6 @@ package org.dimdev.dimdoors.api; +import net.minecraft.registry.Registry; import org.dimdev.dimdoors.block.door.data.condition.Condition; import org.dimdev.dimdoors.pockets.generator.PocketGenerator; import org.dimdev.dimdoors.pockets.modifier.Modifier; @@ -10,8 +11,6 @@ import org.dimdev.dimdoors.world.decay.DecayProcessor; import org.dimdev.dimdoors.world.pocket.type.AbstractPocket; import org.dimdev.dimdoors.world.pocket.type.addon.PocketAddon; -import net.minecraft.util.registry.Registry; - // TODO: javadocs for everything, refactoring public interface DimensionalDoorsApi { default void registerVirtualTargetTypes(Registry> registry) { diff --git a/src/main/java/org/dimdev/dimdoors/block/door/DimensionalDoorBlockRegistrar.java b/src/main/java/org/dimdev/dimdoors/block/door/DimensionalDoorBlockRegistrar.java index 465fdecd..3215e7c8 100644 --- a/src/main/java/org/dimdev/dimdoors/block/door/DimensionalDoorBlockRegistrar.java +++ b/src/main/java/org/dimdev/dimdoors/block/door/DimensionalDoorBlockRegistrar.java @@ -9,12 +9,12 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.*; import net.minecraft.client.render.RenderLayer; +import net.minecraft.registry.Registry; import net.minecraft.state.StateManager; import net.minecraft.state.property.Property; import net.minecraft.text.MutableText; import net.minecraft.text.TranslatableTextContent; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import org.dimdev.dimdoors.DimensionalDoors; import org.dimdev.dimdoors.block.entity.ModBlockEntityTypes; import org.dimdev.dimdoors.item.DimensionalDoorItemRegistrar; diff --git a/src/main/java/org/dimdev/dimdoors/item/DimensionalDoorItemRegistrar.java b/src/main/java/org/dimdev/dimdoors/item/DimensionalDoorItemRegistrar.java index 71f8873e..88f9b608 100644 --- a/src/main/java/org/dimdev/dimdoors/item/DimensionalDoorItemRegistrar.java +++ b/src/main/java/org/dimdev/dimdoors/item/DimensionalDoorItemRegistrar.java @@ -11,6 +11,7 @@ import net.minecraft.block.TrapdoorBlock; import net.minecraft.client.resource.language.I18n; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.*; +import net.minecraft.registry.Registry; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.text.TranslatableTextContent; @@ -18,7 +19,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; import net.minecraft.util.math.Quaternion; import net.minecraft.util.math.Vec3f; -import net.minecraft.util.registry.Registry; import org.apache.commons.lang3.tuple.ImmutableTriple; import org.apache.commons.lang3.tuple.Triple; import org.dimdev.dimdoors.DimensionalDoors; @@ -30,6 +30,7 @@ import org.dimdev.dimdoors.block.entity.EntranceRiftBlockEntity; import org.dimdev.dimdoors.client.UnderlaidChildItemRenderer; import org.dimdev.dimdoors.listener.ItemRegistryEntryAddedListener; import org.dimdev.dimdoors.rift.targets.PublicPocketTarget; +import org.joml.Quaternionf; import java.util.ArrayList; import java.util.HashMap; @@ -189,7 +190,7 @@ public class DimensionalDoorItemRegistrar { public void transform(MatrixStack matrices) { matrices.scale(0.55f, 0.55f, 0.6f); matrices.translate(0.05, -0.05, 0.41); - matrices.multiply(Quaternion.fromEulerXyzDegrees(new Vec3f(90, 0, 0))); + matrices.multiply(new Quaternionf().rotateXYZ(90, 0, 0)); } } diff --git a/src/main/java/org/dimdev/dimdoors/world/decay/DecayPredicate.java b/src/main/java/org/dimdev/dimdoors/world/decay/DecayPredicate.java index 57e9feaa..39ecaade 100644 --- a/src/main/java/org/dimdev/dimdoors/world/decay/DecayPredicate.java +++ b/src/main/java/org/dimdev/dimdoors/world/decay/DecayPredicate.java @@ -5,11 +5,11 @@ import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.SimpleRegistry; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.util.registry.SimpleRegistry; import net.minecraft.world.World; import org.dimdev.dimdoors.DimensionalDoors; import org.dimdev.dimdoors.world.decay.predicates.SimpleBlockDecayPredicate; @@ -19,7 +19,7 @@ import java.util.Set; import java.util.function.Supplier; public interface DecayPredicate { - Registry> REGISTRY = FabricRegistryBuilder.from(new SimpleRegistry>(RegistryKey.ofRegistry(DimensionalDoors.id("decay_predicate_type")), Lifecycle.stable(), null)).buildAndRegister(); + Registry> REGISTRY = FabricRegistryBuilder.from(new SimpleRegistry>(RegistryKey.ofRegistry(DimensionalDoors.id("decay_predicate_type")), Lifecycle.stable(), false)).buildAndRegister(); DecayPredicate NONE = new DecayPredicate() { private static final String ID = "none"; diff --git a/src/main/java/org/dimdev/dimdoors/world/decay/DecayProcessor.java b/src/main/java/org/dimdev/dimdoors/world/decay/DecayProcessor.java index 188cdccb..383d73fe 100644 --- a/src/main/java/org/dimdev/dimdoors/world/decay/DecayProcessor.java +++ b/src/main/java/org/dimdev/dimdoors/world/decay/DecayProcessor.java @@ -4,11 +4,11 @@ import com.mojang.serialization.Lifecycle; import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder; import net.minecraft.block.BlockState; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.SimpleRegistry; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.util.registry.SimpleRegistry; import net.minecraft.world.World; import org.dimdev.dimdoors.DimensionalDoors; import org.dimdev.dimdoors.world.decay.processors.DoorDecayProccessor; @@ -19,7 +19,7 @@ import org.dimdev.dimdoors.world.decay.processors.SimpleDecayProcesor; import java.util.function.Supplier; public interface DecayProcessor { - Registry> REGISTRY = FabricRegistryBuilder.from(new SimpleRegistry>(RegistryKey.ofRegistry(DimensionalDoors.id("decay_processor_type")), Lifecycle.stable(), null)).buildAndRegister(); + Registry> REGISTRY = FabricRegistryBuilder.from(new SimpleRegistry>(RegistryKey.ofRegistry(DimensionalDoors.id("decay_processor_type")), Lifecycle.stable(), false)).buildAndRegister(); DecayProcessor NONE = new DecayProcessor() { @Override diff --git a/src/main/java/org/dimdev/dimdoors/world/decay/LimboDecay.java b/src/main/java/org/dimdev/dimdoors/world/decay/LimboDecay.java index d877ec6c..e11275b3 100644 --- a/src/main/java/org/dimdev/dimdoors/world/decay/LimboDecay.java +++ b/src/main/java/org/dimdev/dimdoors/world/decay/LimboDecay.java @@ -6,6 +6,7 @@ import net.minecraft.block.BlockState; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtElement; import net.minecraft.predicate.entity.EntityPredicates; +import net.minecraft.registry.RegistryKey; import net.minecraft.resource.ResourceManager; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; @@ -13,7 +14,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.random.Random; -import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.World; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/dimdev/dimdoors/world/decay/predicates/SimpleBlockDecayPredicate.java b/src/main/java/org/dimdev/dimdoors/world/decay/predicates/SimpleBlockDecayPredicate.java index 79098af8..993cfabc 100644 --- a/src/main/java/org/dimdev/dimdoors/world/decay/predicates/SimpleBlockDecayPredicate.java +++ b/src/main/java/org/dimdev/dimdoors/world/decay/predicates/SimpleBlockDecayPredicate.java @@ -4,9 +4,9 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import org.dimdev.dimdoors.world.decay.DecayPredicate; @@ -25,14 +25,14 @@ public class SimpleBlockDecayPredicate implements DecayPredicate { @Override public DecayPredicate fromNbt(NbtCompound nbt) { - block = Registry.BLOCK.get(Identifier.tryParse(nbt.getString("block"))); + block = Registries.BLOCK.get(Identifier.tryParse(nbt.getString("block"))); return this; } @Override public NbtCompound toNbt(NbtCompound nbt) { DecayPredicate.super.toNbt(nbt); - nbt.putString("block", Registry.BLOCK.getId(block).toString()); + nbt.putString("block", Registries.BLOCK.getId(block).toString()); return nbt; } diff --git a/src/main/java/org/dimdev/dimdoors/world/decay/processors/DoorDecayProccessor.java b/src/main/java/org/dimdev/dimdoors/world/decay/processors/DoorDecayProccessor.java index 16b90b7f..3a165c6d 100644 --- a/src/main/java/org/dimdev/dimdoors/world/decay/processors/DoorDecayProccessor.java +++ b/src/main/java/org/dimdev/dimdoors/world/decay/processors/DoorDecayProccessor.java @@ -4,10 +4,10 @@ import net.minecraft.block.*; import net.minecraft.block.enums.DoorHinge; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import org.dimdev.dimdoors.world.decay.DecayProcessor; @@ -27,7 +27,7 @@ public class DoorDecayProccessor implements DecayProcessor { @Override public DecayProcessor fromNbt(NbtCompound json) { - block = Registry.BLOCK.get(Identifier.tryParse(json.getString("block"))); + block = Registries.BLOCK.get(Identifier.tryParse(json.getString("block"))); entropy = json.getInt("entropy"); return this; } @@ -35,7 +35,7 @@ public class DoorDecayProccessor implements DecayProcessor { @Override public NbtCompound toNbt(NbtCompound nbt) { DecayProcessor.super.toNbt(nbt); - nbt.putString("block", Registry.BLOCK.getId(block).toString()); + nbt.putString("block", Registries.BLOCK.getId(block).toString()); nbt.putInt("entropy", entropy); return nbt; } diff --git a/src/main/java/org/dimdev/dimdoors/world/decay/processors/DoubleDecayProcessor.java b/src/main/java/org/dimdev/dimdoors/world/decay/processors/DoubleDecayProcessor.java index a7a42d43..fba36a9d 100644 --- a/src/main/java/org/dimdev/dimdoors/world/decay/processors/DoubleDecayProcessor.java +++ b/src/main/java/org/dimdev/dimdoors/world/decay/processors/DoubleDecayProcessor.java @@ -4,10 +4,10 @@ import net.minecraft.block.*; import net.minecraft.block.enums.DoorHinge; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import org.dimdev.dimdoors.world.decay.DecayProcessor; @@ -27,7 +27,7 @@ public class DoubleDecayProcessor implements DecayProcessor { @Override public DecayProcessor fromNbt(NbtCompound json) { - block = Registry.BLOCK.get(Identifier.tryParse(json.getString("block"))); + block = Registries.BLOCK.get(Identifier.tryParse(json.getString("block"))); entropy = json.getInt("entropy"); return this; } @@ -35,7 +35,7 @@ public class DoubleDecayProcessor implements DecayProcessor { @Override public NbtCompound toNbt(NbtCompound nbt) { DecayProcessor.super.toNbt(nbt); - nbt.putString("block", Registry.BLOCK.getId(block).toString()); + nbt.putString("block", Registries.BLOCK.getId(block).toString()); nbt.putInt("entropy", entropy); return nbt; } diff --git a/src/main/java/org/dimdev/dimdoors/world/decay/processors/SimpleDecayProcesor.java b/src/main/java/org/dimdev/dimdoors/world/decay/processors/SimpleDecayProcesor.java index 812a1a43..de105b54 100644 --- a/src/main/java/org/dimdev/dimdoors/world/decay/processors/SimpleDecayProcesor.java +++ b/src/main/java/org/dimdev/dimdoors/world/decay/processors/SimpleDecayProcesor.java @@ -1,12 +1,15 @@ package org.dimdev.dimdoors.world.decay.processors; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.TallPlantBlock; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.Registries; import net.minecraft.state.property.Property; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import org.dimdev.dimdoors.world.decay.DecayProcessor; @@ -29,7 +32,7 @@ public class SimpleDecayProcesor implements DecayProcessor { @Override public DecayProcessor fromNbt(NbtCompound json) { - block = Registry.BLOCK.get(Identifier.tryParse(json.getString("block"))); + block = Registries.BLOCK.get(Identifier.tryParse(json.getString("block"))); entropy = json.getInt("entropy"); return this; } @@ -37,7 +40,7 @@ public class SimpleDecayProcesor implements DecayProcessor { @Override public NbtCompound toNbt(NbtCompound nbt) { DecayProcessor.super.toNbt(nbt); - nbt.putString("block", Registry.BLOCK.getId(block).toString()); + nbt.putString("block", Registries.BLOCK.getId(block).toString()); nbt.putInt("entropy", entropy); return nbt; }