LimboDecay
This commit is contained in:
parent
2657c2d374
commit
1c5599a295
11 changed files with 34 additions and 31 deletions
|
@ -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());
|
||||
|
|
|
@ -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<VirtualTarget.VirtualTargetType<?>> registry) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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<DecayPredicateType<? extends DecayPredicate>> REGISTRY = FabricRegistryBuilder.from(new SimpleRegistry<DecayPredicateType<? extends DecayPredicate>>(RegistryKey.ofRegistry(DimensionalDoors.id("decay_predicate_type")), Lifecycle.stable(), null)).buildAndRegister();
|
||||
Registry<DecayPredicateType<? extends DecayPredicate>> REGISTRY = FabricRegistryBuilder.from(new SimpleRegistry<DecayPredicateType<? extends DecayPredicate>>(RegistryKey.ofRegistry(DimensionalDoors.id("decay_predicate_type")), Lifecycle.stable(), false)).buildAndRegister();
|
||||
|
||||
DecayPredicate NONE = new DecayPredicate() {
|
||||
private static final String ID = "none";
|
||||
|
|
|
@ -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<DecayProcessor.DecayProcessorType<? extends DecayProcessor>> REGISTRY = FabricRegistryBuilder.from(new SimpleRegistry<DecayProcessor.DecayProcessorType<? extends DecayProcessor>>(RegistryKey.ofRegistry(DimensionalDoors.id("decay_processor_type")), Lifecycle.stable(), null)).buildAndRegister();
|
||||
Registry<DecayProcessor.DecayProcessorType<? extends DecayProcessor>> REGISTRY = FabricRegistryBuilder.from(new SimpleRegistry<DecayProcessorType<? extends DecayProcessor>>(RegistryKey.ofRegistry(DimensionalDoors.id("decay_processor_type")), Lifecycle.stable(), false)).buildAndRegister();
|
||||
|
||||
DecayProcessor NONE = new DecayProcessor() {
|
||||
@Override
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue