Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-09-29 07:51:05 +02:00
Code Issues Projects Releases Wiki Activity

a bunch more work on the port

Browse source
This commit is contained in:
Ell 2024-09-25 18:29:38 +02:00
parent 6525ff5d25
commit e50d3fc69a
107 changed files with 1322 additions and 1269 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/de/ellpeck/naturesaura/Helper.java
View file

@ -6,7 +6,6 @@ import de.ellpeck.naturesaura.api.aura.item.IAuraRecharge;
import de.ellpeck.naturesaura.api.misc.ILevelData;
import de.ellpeck.naturesaura.blocks.tiles.BlockEntityImpl;
import de.ellpeck.naturesaura.chunk.AuraChunk;
import de.ellpeck.naturesaura.compat.Compat;
import de.ellpeck.naturesaura.misc.LevelData;
import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles;
@ -15,6 +14,8 @@ import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.nbt.IntArrayTag;
import net.minecraft.nbt.Tag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerChunkCache;
import net.minecraft.server.level.ServerPlayer;
@ -367,4 +368,13 @@ public final class Helper {
return true;
}
public static BlockPos readBlockPos(Tag tag) {
if (tag instanceof IntArrayTag i) {
var arr = i.getAsIntArray();
if (arr.length == 3)
return new BlockPos(arr[0], arr[1], arr[2]);
}
return null;
}
}

30
src/main/java/de/ellpeck/naturesaura/ModConfig.java
View file

@ -56,27 +56,27 @@ public final class ModConfig {
this.additionalBotanistPickaxeConversions = builder
.comment("Additional conversion recipes for the Botanist's Pickaxe right click function. Each entry needs to be formatted as modid:input_block[prop1=value1,...]->modid:output_block[prop1=value1,...] where block state properties are optional, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
.translation("config." + NaturesAura.MOD_ID + ".additionalBotanistPickaxeConversions")
.defineList("additionalBotanistPickaxeConversions", Collections.emptyList(), s -> true);
.defineList("additionalBotanistPickaxeConversions", Collections.emptyList(), () -> "", s -> true);
this.auraTypeOverrides = builder
.comment("Additional dimensions that map to Aura types that should be present in them. This is useful if you have a modpack with custom dimensions that should have Aura act similarly to an existing dimension in them. Each entry needs to be formatted as dimension_name->aura_type, where aura_type can be any of naturesaura:overworld, naturesaura:nether and naturesaura:end, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
.translation("config." + NaturesAura.MOD_ID + ".auraTypeOverrides")
.defineList("auraTypeOverrides", Collections.emptyList(), s -> true);
.defineList("auraTypeOverrides", Collections.emptyList(), () -> "", s -> true);
this.additionalOres = builder
.comment("Additional blocks that are recognized as generatable ores for the passive ore generation effect. Each entry needs to be formatted as tag_name->oreWeight->dimension where a higher weight makes the ore more likely to spawn with 5000 being the weight of coal, the default ore with the highest weight, and dimension being any of overworld and nether, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
.translation("config." + NaturesAura.MOD_ID + ".additionalOres")
.defineList("additionalOres", Collections.emptyList(), s -> true);
.defineList("additionalOres", Collections.emptyList(), () -> "", s -> true);
this.oreExceptions = builder
.comment("Blocks that are exempt from being recognized as generatable ores for the passive ore generation effect. Each entry needs to be formatted as modid:block[prop1=value1,...] where block state properties are optional, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
.translation("config." + NaturesAura.MOD_ID + ".oreExceptions")
.defineList("oreExceptions", Collections.emptyList(), s -> true);
.defineList("oreExceptions", Collections.emptyList(), () -> "", s -> true);
this.plantBoostExceptions = builder
.comment("Blocks that are exept from being fertilized by the plant boost effect. Each entry needs to be formatted as modid:block, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
.translation("config." + NaturesAura.MOD_ID + ".plantBoostExceptions")
.defineList("plantBoostExceptions", Collections.emptyList(), s -> true);
.defineList("plantBoostExceptions", Collections.emptyList(), () -> "", s -> true);
this.additionalProjectiles = builder
.comment("Additional projectile types that are allowed to be consumed by the projectile generator. Each entry needs to be formatted as entity_registry_name->aura_amount, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
.translation("config." + NaturesAura.MOD_ID + ".additionalProjectiles")
.defineList("additionalProjectiles", Collections.emptyList(), s -> true);
.defineList("additionalProjectiles", Collections.emptyList(), () -> "", s -> true);
this.fieldCreatorRange = builder
.comment("The amount of blocks that can be between two Aura Field Creators for them to be connectable and work together")
.translation("config." + NaturesAura.MOD_ID + ".fieldCreatorRange")
@ -191,7 +191,7 @@ public final class ModConfig {
throw new IllegalStateException("Nature's Aura has detected that all negative Aura Imbalance effects are disabled in the config file. This is disallowed behavior. Please enable at least one negative effect.");
try {
for (String s : this.additionalBotanistPickaxeConversions.get()) {
for (var s : this.additionalBotanistPickaxeConversions.get()) {
var split = s.split("->");
NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.put(
Objects.requireNonNull(Helper.getStateFromString(split[0]), "state1"),
@ -202,10 +202,10 @@ public final class ModConfig {
}
try {
for (String s : this.auraTypeOverrides.get()) {
for (var s : this.auraTypeOverrides.get()) {
var split = s.split("->");
var dim = new ResourceLocation(split[0]);
var type = Objects.requireNonNull((BasicAuraType) NaturesAuraAPI.AURA_TYPES.get(new ResourceLocation(split[1])), "type");
var dim = ResourceLocation.parse(split[0]);
var type = Objects.requireNonNull((BasicAuraType) NaturesAuraAPI.AURA_TYPES.get(ResourceLocation.parse(split[1])), "type");
type.addDimensionType(dim);
}
} catch (Exception e) {
@ -213,9 +213,9 @@ public final class ModConfig {
}
try {
for (String s : this.additionalOres.get()) {
for (var s : this.additionalOres.get()) {
var split = s.split("->");
var ore = new WeightedOre(new ResourceLocation(split[0]), Integer.parseInt(split[1]));
var ore = new WeightedOre(ResourceLocation.parse(split[0]), Integer.parseInt(split[1]));
var dimension = split[2];
if ("nether".equalsIgnoreCase(dimension)) {
NaturesAuraAPI.NETHER_ORES.removeIf(o -> o.tag.equals(ore.tag));
@ -232,7 +232,7 @@ public final class ModConfig {
}
try {
for (String s : this.oreExceptions.get())
for (var s : this.oreExceptions.get())
OreSpawnEffect.SPAWN_EXCEPTIONS.add(Objects.requireNonNull(Helper.getStateFromString(s)));
} catch (Exception e) {
NaturesAura.LOGGER.warn("Error parsing oreExceptions", e);
@ -240,7 +240,7 @@ public final class ModConfig {
try {
for (var s : this.plantBoostExceptions.get())
PlantBoostEffect.EXCEPTIONS.add(Objects.requireNonNull(BuiltInRegistries.BLOCK.get(new ResourceLocation(s))));
PlantBoostEffect.EXCEPTIONS.add(Objects.requireNonNull(BuiltInRegistries.BLOCK.get(ResourceLocation.parse(s))));
} catch (Exception e) {
NaturesAura.LOGGER.warn("Error parsing plantBoostExceptions", e);
@ -249,7 +249,7 @@ public final class ModConfig {
try {
for (var s : this.additionalProjectiles.get()) {
var split = s.split("->");
var name = new ResourceLocation(split[0]);
var name = ResourceLocation.parse(split[0]);
var type = Objects.requireNonNull(BuiltInRegistries.ENTITY_TYPE.get(name));
var amount = Integer.parseInt(split[1]);
NaturesAuraAPI.PROJECTILE_GENERATIONS.put(type, amount);

10
src/main/java/de/ellpeck/naturesaura/NaturesAura.java
View file

@ -10,8 +10,7 @@ import de.ellpeck.naturesaura.proxy.ClientProxy;
import de.ellpeck.naturesaura.proxy.IProxy;
import de.ellpeck.naturesaura.proxy.ServerProxy;
import de.ellpeck.naturesaura.recipes.ModRecipes;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.ModLoadingContext;
import net.neoforged.fml.ModContainer;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.neoforged.fml.loading.FMLEnvironment;
@ -30,15 +29,16 @@ public final class NaturesAura {
public static NaturesAura instance;
public static IProxy proxy;
public NaturesAura(IEventBus eventBus) {
public NaturesAura(ModContainer container) {
NaturesAura.instance = this;
NaturesAura.proxy = FMLEnvironment.dist.isClient() ? new ClientProxy() : new ServerProxy();
eventBus.addListener(this::setup);
container.getEventBus().addListener(this::setup);
container.getEventBus().register(NaturesAura.proxy);
var builder = new ModConfigSpec.Builder();
ModConfig.instance = new ModConfig(builder);
ModLoadingContext.get().registerConfig(net.neoforged.fml.config.ModConfig.Type.COMMON, builder.build());
container.registerConfig(net.neoforged.fml.config.ModConfig.Type.COMMON, builder.build());
}
public void setup(FMLCommonSetupEvent event) {

10
src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java
View file

@ -9,7 +9,6 @@ import de.ellpeck.naturesaura.reg.ICustomItemModel;
import de.ellpeck.naturesaura.reg.IModItem;
import de.ellpeck.naturesaura.reg.ModRegistry;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.Registries;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.RandomSource;
@ -19,11 +18,9 @@ import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.block.*;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.neoforged.neoforge.event.EventHooks;
import net.neoforged.bus.api.Event;
public class BlockAncientSapling extends BushBlock implements BonemealableBlock, IModItem, ICustomBlockState, ICustomItemModel {
@ -75,11 +72,14 @@ public class BlockAncientSapling extends BushBlock implements BonemealableBlock,
public void performBonemeal(ServerLevel level, RandomSource rand, BlockPos pos, BlockState state) {
if (state.getValue(SaplingBlock.STAGE) == 0) {
level.setBlock(pos, state.cycle(SaplingBlock.STAGE), 4);
} else if (!EventHooks.blockGrowFeature(level, rand, pos, null).getResult().equals(Event.Result.DENY)) {
Registry<ConfiguredFeature<?, ?>> registry = level.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE);
} else {
var event = EventHooks.fireBlockGrowFeature(level, rand, pos, null);
if (!event.isCanceled()) {
var registry = level.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE);
registry.getHolderOrThrow(ModFeatures.Configured.ANCIENT_TREE).value().place(level, level.getChunkSource().getGenerator(), rand, pos);
}
}
}
@Override
public void generateCustomBlockState(BlockStateGenerator generator) {

12
src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java
View file

@ -17,11 +17,12 @@ import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.phys.AABB;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.neoforge.event.entity.living.*;
import net.neoforged.neoforge.event.entity.living.LivingExperienceDropEvent;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.neoforge.event.entity.living.LivingEvent;
import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.neoforge.event.entity.living.LivingDeathEvent;
import net.neoforged.neoforge.event.entity.living.LivingDropsEvent;
import net.neoforged.neoforge.event.entity.living.LivingExperienceDropEvent;
import net.neoforged.neoforge.event.tick.EntityTickEvent;
public class BlockAnimalGenerator extends BlockContainerImpl implements IVisualizable, ICustomBlockState {
@ -32,7 +33,7 @@ public class BlockAnimalGenerator extends BlockContainerImpl implements IVisuali
}
@SubscribeEvent
public void onLivingUpdate(LivingEvent.LivingTickEvent event) {
public void onLivingUpdate(EntityTickEvent event) {
var entity = event.getEntity();
if (entity.level().isClientSide || entity.level().getGameTime() % 40 != 0 || !(entity instanceof Animal) || entity instanceof Npc)
return;
@ -112,4 +113,5 @@ public class BlockAnimalGenerator extends BlockContainerImpl implements IVisuali
generator.modLoc("block/" + this.getBaseName() + "_bottom"),
generator.modLoc("block/" + this.getBaseName() + "_top")));
}
}

9
src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java
View file

@ -13,8 +13,9 @@ import net.minecraft.core.Direction;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.RandomSource;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.ItemInteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
@ -52,9 +53,8 @@ public class BlockAuraTimer extends BlockContainerImpl implements ICustomBlockSt
}
@Override
@SuppressWarnings("deprecation")
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult p_225533_6_) {
return Helper.putStackOnTile(player, handIn, pos, 0, true);
protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
return Helper.putStackOnTile(player, hand, pos, 0, true);
}
@Override
@ -80,4 +80,5 @@ public class BlockAuraTimer extends BlockContainerImpl implements ICustomBlockSt
public void registerTESR() {
BlockEntityRenderers.register(ModBlockEntities.AURA_TIMER, RenderAuraTimer::new);
}
}

13
src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java
View file

@ -20,6 +20,7 @@ import net.minecraft.util.RandomSource;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.TooltipFlag;
@ -85,10 +86,9 @@ public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider
}
@Override
@SuppressWarnings("deprecation")
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
if (!levelIn.isClientSide) {
var tile = levelIn.getBlockEntity(pos);
protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) {
if (!level.isClientSide) {
var tile = level.getBlockEntity(pos);
if (tile instanceof BlockEntityEnderCrate crate && crate.canOpen() && crate.canUseRightNow(2500)) {
crate.drainAura(2500);
player.openMenu(crate, pos);
@ -98,9 +98,8 @@ public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider
}
@Override
@OnlyIn(Dist.CLIENT)
public void appendHoverText(ItemStack stack, @Nullable BlockGetter levelIn, List<Component> tooltip, TooltipFlag flagIn) {
BlockEnderCrate.addEnderNameInfo(stack, tooltip);
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
BlockEnderCrate.addEnderNameInfo(stack, tooltipComponents);
}
@Override

16
src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java
View file

@ -9,8 +9,9 @@ import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.util.RandomSource;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.ItemInteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.state.BlockState;
@ -25,11 +26,10 @@ public class BlockFieldCreator extends BlockContainerImpl implements ICustomBloc
}
@Override
@SuppressWarnings("deprecation")
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult result) {
var tile = levelIn.getBlockEntity(pos);
protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
var tile = level.getBlockEntity(pos);
if (tile instanceof BlockEntityFieldCreator) {
if (!levelIn.isClientSide) {
if (!level.isClientSide) {
var key = NaturesAura.MOD_ID + ":field_creator_pos";
var compound = player.getPersistentData();
if (!player.isShiftKeyDown() && compound.contains(key)) {
@ -37,7 +37,7 @@ public class BlockFieldCreator extends BlockContainerImpl implements ICustomBloc
var creator = (BlockEntityFieldCreator) tile;
if (!pos.equals(stored)) {
if (creator.isCloseEnough(stored)) {
var otherTile = levelIn.getBlockEntity(stored);
var otherTile = level.getBlockEntity(stored);
if (otherTile instanceof BlockEntityFieldCreator otherCreator) {
creator.connectionOffset = stored.subtract(pos);
creator.isMain = true;
@ -60,9 +60,9 @@ public class BlockFieldCreator extends BlockContainerImpl implements ICustomBloc
player.displayClientMessage(Component.translatable("info." + NaturesAura.MOD_ID + ".stored_pos"), true);
}
}
return InteractionResult.SUCCESS;
return ItemInteractionResult.SUCCESS;
} else
return InteractionResult.FAIL;
return ItemInteractionResult.FAIL;
}
@Override

25
src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java
View file

@ -8,7 +8,6 @@ import de.ellpeck.naturesaura.reg.ICustomItemModel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.context.BlockPlaceContext;
@ -18,7 +17,6 @@ import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.HopperBlock;
import net.minecraft.world.level.block.RenderShape;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.Hopper;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.DirectionProperty;
@ -28,27 +26,27 @@ import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.items.IItemHandler;
import javax.annotation.Nullable;
public class BlockGratedChute extends BlockContainerImpl implements ICustomBlockState, ICustomItemModel {
public static final DirectionProperty FACING = HopperBlock.FACING;
private static final VoxelShape INSIDE = Block.box(2.0, 11.0, 2.0, 14.0, 16.0, 14.0);
private static final VoxelShape INPUT_SHAPE = Block.box(0.0D, 10.0D, 0.0D, 16.0D, 16.0D, 16.0D);
private static final VoxelShape MIDDLE_SHAPE = Block.box(4.0D, 4.0D, 4.0D, 12.0D, 10.0D, 12.0D);
private static final VoxelShape INPUT_MIDDLE_SHAPE = Shapes.or(BlockGratedChute.MIDDLE_SHAPE, BlockGratedChute.INPUT_SHAPE);
private static final VoxelShape COMBINED_SHAPE = Shapes.join(BlockGratedChute.INPUT_MIDDLE_SHAPE, Hopper.INSIDE, BooleanOp.ONLY_FIRST);
private static final VoxelShape COMBINED_SHAPE = Shapes.join(BlockGratedChute.INPUT_MIDDLE_SHAPE, BlockGratedChute.INSIDE, BooleanOp.ONLY_FIRST);
private static final VoxelShape DOWN_SHAPE = Shapes.or(BlockGratedChute.COMBINED_SHAPE, Block.box(6.0D, 0.0D, 6.0D, 10.0D, 4.0D, 10.0D));
private static final VoxelShape EAST_SHAPE = Shapes.or(BlockGratedChute.COMBINED_SHAPE, Block.box(12.0D, 4.0D, 6.0D, 16.0D, 8.0D, 10.0D));
private static final VoxelShape NORTH_SHAPE = Shapes.or(BlockGratedChute.COMBINED_SHAPE, Block.box(6.0D, 4.0D, 0.0D, 10.0D, 8.0D, 4.0D));
private static final VoxelShape SOUTH_SHAPE = Shapes.or(BlockGratedChute.COMBINED_SHAPE, Block.box(6.0D, 4.0D, 12.0D, 10.0D, 8.0D, 16.0D));
private static final VoxelShape WEST_SHAPE = Shapes.or(BlockGratedChute.COMBINED_SHAPE, Block.box(0.0D, 4.0D, 6.0D, 4.0D, 8.0D, 10.0D));
private static final VoxelShape DOWN_RAYTRACE_SHAPE = Hopper.INSIDE;
private static final VoxelShape EAST_RAYTRACE_SHAPE = Shapes.or(Hopper.INSIDE, Block.box(12.0D, 8.0D, 6.0D, 16.0D, 10.0D, 10.0D));
private static final VoxelShape NORTH_RAYTRACE_SHAPE = Shapes.or(Hopper.INSIDE, Block.box(6.0D, 8.0D, 0.0D, 10.0D, 10.0D, 4.0D));
private static final VoxelShape SOUTH_RAYTRACE_SHAPE = Shapes.or(Hopper.INSIDE, Block.box(6.0D, 8.0D, 12.0D, 10.0D, 10.0D, 16.0D));
private static final VoxelShape WEST_RAYTRACE_SHAPE = Shapes.or(Hopper.INSIDE, Block.box(0.0D, 8.0D, 6.0D, 4.0D, 10.0D, 10.0D));
private static final VoxelShape DOWN_RAYTRACE_SHAPE = BlockGratedChute.INSIDE;
private static final VoxelShape EAST_RAYTRACE_SHAPE = Shapes.or(BlockGratedChute.INSIDE, Block.box(12.0D, 8.0D, 6.0D, 16.0D, 10.0D, 10.0D));
private static final VoxelShape NORTH_RAYTRACE_SHAPE = Shapes.or(BlockGratedChute.INSIDE, Block.box(6.0D, 8.0D, 0.0D, 10.0D, 10.0D, 4.0D));
private static final VoxelShape SOUTH_RAYTRACE_SHAPE = Shapes.or(BlockGratedChute.INSIDE, Block.box(6.0D, 8.0D, 12.0D, 10.0D, 10.0D, 16.0D));
private static final VoxelShape WEST_RAYTRACE_SHAPE = Shapes.or(BlockGratedChute.INSIDE, Block.box(0.0D, 8.0D, 6.0D, 4.0D, 10.0D, 10.0D));
public BlockGratedChute() {
super("grated_chute", BlockEntityGratedChute.class, Properties.of().strength(3.0F, 8.0F).sound(SoundType.METAL));
@ -81,17 +79,16 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock
case SOUTH -> BlockGratedChute.SOUTH_RAYTRACE_SHAPE;
case WEST -> BlockGratedChute.WEST_RAYTRACE_SHAPE;
case EAST -> BlockGratedChute.EAST_RAYTRACE_SHAPE;
default -> Hopper.INSIDE;
default -> BlockGratedChute.INSIDE;
};
}
@Override
@SuppressWarnings("deprecation")
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
var tile = levelIn.getBlockEntity(pos);
protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) {
var tile = level.getBlockEntity(pos);
if (!(tile instanceof BlockEntityGratedChute chute))
return InteractionResult.FAIL;
if (!levelIn.isClientSide) {
if (!level.isClientSide) {
chute.isBlacklist = !chute.isBlacklist;
chute.sendToClients();
}

9
src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java
View file

@ -4,7 +4,6 @@ import de.ellpeck.naturesaura.blocks.tiles.BlockEntityItemDistributor;
import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.reg.ICustomBlockState;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
@ -19,14 +18,13 @@ public class BlockItemDistributor extends BlockContainerImpl implements ICustomB
}
@Override
@SuppressWarnings("deprecation")
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) {
if (!player.isShiftKeyDown())
return InteractionResult.FAIL;
var tile = levelIn.getBlockEntity(pos);
var tile = level.getBlockEntity(pos);
if (!(tile instanceof BlockEntityItemDistributor))
return InteractionResult.FAIL;
if (!levelIn.isClientSide) {
if (!level.isClientSide) {
var distributor = (BlockEntityItemDistributor) tile;
distributor.isRandomMode = !distributor.isRandomMode;
distributor.sendToClients();
@ -41,4 +39,5 @@ public class BlockItemDistributor extends BlockContainerImpl implements ICustomB
generator.modLoc("block/" + this.getBaseName() + "_bottom"),
generator.modLoc("block/" + this.getBaseName() + "_top")));
}
}

8
src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java
View file

@ -10,8 +10,9 @@ import de.ellpeck.naturesaura.reg.ITESRProvider;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.ItemInteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
@ -41,9 +42,8 @@ public class BlockNatureAltar extends BlockContainerImpl implements ITESRProvide
}
@Override
@SuppressWarnings("deprecation")
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
return Helper.putStackOnTile(player, handIn, pos, 0, true);
protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
return Helper.putStackOnTile(player, hand, pos, 0, true);
}
@Override

9
src/main/java/de/ellpeck/naturesaura/blocks/BlockOfferingTable.java
View file

@ -10,8 +10,9 @@ import de.ellpeck.naturesaura.reg.ITESRProvider;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.ItemInteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.SoundType;
@ -35,9 +36,8 @@ public class BlockOfferingTable extends BlockContainerImpl implements ITESRProvi
}
@Override
@SuppressWarnings("deprecation")
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
return Helper.putStackOnTile(player, handIn, pos, 0, true);
protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
return Helper.putStackOnTile(player, hand, pos, 0, true);
}
@Override
@ -55,4 +55,5 @@ public class BlockOfferingTable extends BlockContainerImpl implements ITESRProvi
public void registerTESR() {
BlockEntityRenderers.register(ModBlockEntities.OFFERING_TABLE, RenderOfferingTable::new);
}
}

6
src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java
View file

@ -22,10 +22,9 @@ import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.neoforge.event.entity.living.MobSpawnEvent;
import net.neoforged.bus.api.Event;
import net.neoforged.bus.api.SubscribeEvent;
public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable, ICustomBlockState {
@ -72,7 +71,7 @@ public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable,
new PacketParticles(lampPos.getX(), lampPos.getY(), lampPos.getZ(), PacketParticles.Type.SPAWN_LAMP));
}
event.setResult(Event.Result.DENY);
event.setResult(MobSpawnEvent.PositionCheck.Result.FAIL);
break;
}
}
@ -105,4 +104,5 @@ public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable,
public void generateCustomBlockState(BlockStateGenerator generator) {
generator.simpleBlock(this, generator.models().getExistingFile(generator.modLoc(this.getBaseName())));
}
}

5
src/main/java/de/ellpeck/naturesaura/blocks/BlockStairsNA.java
View file

@ -8,14 +8,12 @@ import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.StairBlock;
import net.minecraft.world.level.block.state.BlockState;
import java.util.function.Supplier;
public class BlockStairsNA extends StairBlock implements IModItem, ICustomBlockState {
public final String textureName;
private final String baseName;
public BlockStairsNA(String baseName, String textureName, Supplier<BlockState> modelState, Block.Properties properties) {
public BlockStairsNA(String baseName, String textureName, BlockState modelState, Block.Properties properties) {
super(modelState, properties.dynamicShape());
this.baseName = baseName;
this.textureName = textureName;
@ -31,4 +29,5 @@ public class BlockStairsNA extends StairBlock implements IModItem, ICustomBlockS
public void generateCustomBlockState(BlockStateGenerator generator) {
generator.stairsBlock(this, generator.modLoc("block/" + this.textureName));
}
}

14
src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java
View file

@ -16,7 +16,7 @@ import net.minecraft.world.level.block.SaplingBlock;
public final class Multiblocks {
public static final IMultiblock ALTAR = NaturesAuraAPI.instance().createMultiblock(
new ResourceLocation(NaturesAura.MOD_ID, "altar"),
ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "altar"),
new String[][]{
{" M ", " ", " ", " ", "M M", " ", " ", " ", " M "},
{" B ", " ", " ", " ", "B B", " ", " ", " ", " B "},
@ -29,7 +29,7 @@ public final class Multiblocks {
'0', ModBlocks.NATURE_ALTAR,
' ', Matcher.any());
public static final IMultiblock TREE_RITUAL = NaturesAuraAPI.instance().createMultiblock(
new ResourceLocation(NaturesAura.MOD_ID, "tree_ritual"),
ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "tree_ritual"),
new String[][]{
{" W ", " W W ", " GGG ", " GG GG ", "W G 0 G W", " GG GG ", " GGG ", " W W ", " W "}},
'W', new Matcher(ModBlocks.WOOD_STAND.defaultBlockState(),
@ -50,7 +50,7 @@ public final class Multiblocks {
),
' ', Matcher.any());
public static final IMultiblock POTION_GENERATOR = NaturesAuraAPI.instance().createMultiblock(
new ResourceLocation(NaturesAura.MOD_ID, "potion_generator"),
ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "potion_generator"),
new String[][]{
{"R R", " ", " ", " ", " ", " ", "R R"},
{"N N", " ", " ", " ", " ", " ", "N N"},
@ -61,7 +61,7 @@ public final class Multiblocks {
'0', ModBlocks.POTION_GENERATOR,
' ', Matcher.any());
public static final IMultiblock OFFERING_TABLE = NaturesAuraAPI.instance().createMultiblock(
new ResourceLocation(NaturesAura.MOD_ID, "offering_table"),
ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "offering_table"),
new String[][]{
{" RRRRR ", " R R ", "R RRR R", "R R R R", "R R 0 R R", "R R R R", "R RRR R", " R R ", " RRRRR "}},
'R', new Matcher(Blocks.POPPY.defaultBlockState(),
@ -69,7 +69,7 @@ public final class Multiblocks {
'0', ModBlocks.OFFERING_TABLE,
' ', Matcher.any());
public static final IMultiblock ANIMAL_SPAWNER = NaturesAuraAPI.instance().createMultiblock(
new ResourceLocation(NaturesAura.MOD_ID, "animal_spawner"),
ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "animal_spawner"),
new String[][]{
{" ", " ", " ", " 0 ", " ", " ", " "},
{" HHH ", " HRRRH ", "HRWRWRH", "HRR RRH", "HRWRWRH", " HRRRH ", " HHH "}},
@ -79,7 +79,7 @@ public final class Multiblocks {
'0', ModBlocks.ANIMAL_SPAWNER,
' ', Matcher.any());
public static final IMultiblock AUTO_CRAFTER = NaturesAuraAPI.instance().createMultiblock(
new ResourceLocation(NaturesAura.MOD_ID, "auto_crafter"),
ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "auto_crafter"),
new String[][]{
{"PPPPPPP", "PLPLPLP", "PPPPPPP", "PLP0PLP", "PPPPPPP", "PLPLPLP", "PPPPPPP"}},
'P', ModBlocks.ANCIENT_PLANKS,
@ -87,7 +87,7 @@ public final class Multiblocks {
'0', ModBlocks.AUTO_CRAFTER,
' ', Matcher.any());
public static final IMultiblock RF_CONVERTER = NaturesAuraAPI.instance().createMultiblock(
new ResourceLocation(NaturesAura.MOD_ID, "rf_converter"),
ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "rf_converter"),
new String[][]{
{" ", " ", " ", " R ", " ", " ", " "},
{" ", " R ", " ", " R R ", " ", " R ", " "},

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAncientLeaves.java
View file

@ -3,6 +3,7 @@ package de.ellpeck.naturesaura.blocks.tiles;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.container.NaturalAuraContainer;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.block.state.BlockState;
@ -29,15 +30,15 @@ public class BlockEntityAncientLeaves extends BlockEntityImpl {
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK)
this.container.writeNBT(compound);
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK)
this.container.readNBT(compound);
}

12
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalSpawner.java
View file

@ -10,6 +10,7 @@ import de.ellpeck.naturesaura.packet.PacketParticles;
import de.ellpeck.naturesaura.recipes.AnimalSpawnerRecipe;
import de.ellpeck.naturesaura.recipes.ModRecipes;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -21,7 +22,6 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.AABB;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class BlockEntityAnimalSpawner extends BlockEntityImpl implements ITickableBlockEntity {
@ -138,8 +138,8 @@ public class BlockEntityAnimalSpawner extends BlockEntityImpl implements ITickab
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
if (this.currentRecipe != null) {
compound.putString("recipe", this.currentRecipe.id().toString());
@ -152,12 +152,12 @@ public class BlockEntityAnimalSpawner extends BlockEntityImpl implements ITickab
@SuppressWarnings("unchecked")
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
if (compound.contains("recipe")) {
if (this.hasLevel()) {
var name = new ResourceLocation(compound.getString("recipe"));
var name = ResourceLocation.parse(compound.getString("recipe"));
this.currentRecipe = (RecipeHolder<AnimalSpawnerRecipe>) this.level.getRecipeManager().byKey(name).orElse(null);
}
this.spawnX = compound.getDouble("spawn_x");

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraBloom.java
View file

@ -1,6 +1,7 @@
package de.ellpeck.naturesaura.blocks.tiles;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
@ -27,15 +28,15 @@ public class BlockEntityAuraBloom extends BlockEntityImpl implements ITickableBl
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type == SaveType.TILE)
compound.putBoolean("just_generated", this.justGenerated);
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type == SaveType.TILE)
this.justGenerated = compound.getBoolean("just_generated");
}

14
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraTimer.java
View file

@ -8,6 +8,7 @@ import de.ellpeck.naturesaura.items.ModItems;
import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.state.BlockState;
@ -98,20 +99,21 @@ public class BlockEntityAuraTimer extends BlockEntityImpl implements ITickableBl
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
compound.put("items", this.itemHandler.serializeNBT());
compound.put("items", this.itemHandler.serializeNBT(registries));
compound.putInt("timer", this.timer);
}
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
this.itemHandler.deserializeNBT(compound.getCompound("items"));
this.itemHandler.deserializeNBT(registries, compound.getCompound("items"));
this.timer = compound.getInt("timer");
}
}
}

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAutoCrafter.java
View file

@ -68,7 +68,7 @@ public class BlockEntityAutoCrafter extends BlockEntityImpl implements ITickable
return;
if (entities.isEmpty())
continue;
var entity = entities.get(0);
var entity = entities.getFirst();
if (entity.hasPickUpDelay())
return;
var stack = entity.getItem();
@ -78,11 +78,11 @@ public class BlockEntityAutoCrafter extends BlockEntityImpl implements ITickable
this.crafting.setItem(i, stack.copy());
}
var recipe = this.level.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, this.crafting, this.level).orElse(null);
var recipe = this.level.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, this.crafting.asCraftInput(), this.level).orElse(null);
if (recipe == null)
return;
var result = recipe.value().assemble(this.crafting, this.level.registryAccess());
var result = recipe.value().assemble(this.crafting.asCraftInput(), this.level.registryAccess());
if (result.isEmpty())
return;
var resultItem = new ItemEntity(this.level,
@ -90,7 +90,7 @@ public class BlockEntityAutoCrafter extends BlockEntityImpl implements ITickable
resultItem.setDeltaMovement(0, 0, 0);
this.level.addFreshEntity(resultItem);
var remainingItems = recipe.value().getRemainingItems(this.crafting);
var remainingItems = recipe.value().getRemainingItems(this.crafting.asCraftInput());
for (var i = 0; i < items.length; i++) {
var item = items[i];
if (item == null)
@ -115,4 +115,5 @@ public class BlockEntityAutoCrafter extends BlockEntityImpl implements ITickable
}
}
}
}

4
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityBlastFurnaceBooster.java
View file

@ -8,6 +8,7 @@ import net.minecraft.core.Direction;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.item.crafting.SingleRecipeInput;
import net.minecraft.world.level.block.entity.BlastFurnaceBlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.neoforged.neoforge.capabilities.Capabilities;
@ -35,7 +36,8 @@ public class BlockEntityBlastFurnaceBooster extends BlockEntityImpl implements I
var below = this.level.getBlockEntity(this.worldPosition.below());
if (!(below instanceof BlastFurnaceBlockEntity tile))
return;
Recipe<?> recipe = this.level.getRecipeManager().getRecipeFor(BlockEntityFurnaceHeater.getRecipeType(tile), tile, this.level).orElse(null).value();
var input = new SingleRecipeInput(tile.getItem(0));
Recipe<?> recipe = this.level.getRecipeManager().getRecipeFor(BlockEntityFurnaceHeater.getRecipeType(tile), input, this.level).orElse(null).value();
if (recipe == null)
return;
if (!this.isApplicable(recipe.getIngredients()))

17
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChorusGenerator.java
View file

@ -1,9 +1,11 @@
package de.ellpeck.naturesaura.blocks.tiles;
import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.NbtUtils;
@ -97,8 +99,8 @@ public class BlockEntityChorusGenerator extends BlockEntityImpl implements ITick
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type == SaveType.TILE) {
var list = new ListTag();
for (var pos : this.currentlyBreaking)
@ -109,14 +111,15 @@ public class BlockEntityChorusGenerator extends BlockEntityImpl implements ITick
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type == SaveType.TILE) {
this.currentlyBreaking.clear();
var list = compound.getList("breaking", 10);
for (var i = 0; i < list.size(); i++)
this.currentlyBreaking.add(NbtUtils.readBlockPos(list.getCompound(i)));
var list = compound.getList("breaking", ListTag.TAG_INT_ARRAY);
for (var tag : list)
this.currentlyBreaking.add(Helper.readBlockPos(tag));
this.auraPerBlock = compound.getInt("aura");
}
}
}

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChunkLoader.java
View file

@ -3,6 +3,7 @@ package de.ellpeck.naturesaura.blocks.tiles;
import de.ellpeck.naturesaura.ModConfig;
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Mth;
@ -108,15 +109,15 @@ public class BlockEntityChunkLoader extends BlockEntityImpl implements ITickable
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type == SaveType.TILE)
compound.putLongArray("forced_chunks", this.forcedChunks.stream().map(ChunkPos::toLong).collect(Collectors.toList()));
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type == SaveType.TILE) {
this.forcedChunks.clear();

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEndFlower.java
View file

@ -5,6 +5,7 @@ import de.ellpeck.naturesaura.api.aura.container.BasicAuraContainer;
import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.item.ItemEntity;
@ -94,8 +95,8 @@ public class BlockEntityEndFlower extends BlockEntityImpl implements ITickableBl
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
this.container.writeNBT(compound);
compound.putBoolean("drain_mode", this.isDrainMode);
@ -103,8 +104,8 @@ public class BlockEntityEndFlower extends BlockEntityImpl implements ITickableBl
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
this.container.readNBT(compound);
this.isDrainMode = compound.getBoolean("drain_mode");

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEnderCrate.java
View file

@ -8,6 +8,7 @@ import de.ellpeck.naturesaura.gui.ContainerEnderCrate;
import de.ellpeck.naturesaura.gui.ModContainers;
import net.minecraft.ChatFormatting;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.world.MenuProvider;
@ -110,8 +111,8 @@ public class BlockEntityEnderCrate extends BlockEntityImpl implements MenuProvid
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
if (this.name != null)
compound.putString("name", this.name);
@ -119,8 +120,8 @@ public class BlockEntityEnderCrate extends BlockEntityImpl implements MenuProvid
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
if (compound.contains("name"))
this.name = compound.getString("name");

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java
View file

@ -7,6 +7,7 @@ import de.ellpeck.naturesaura.api.aura.type.IAuraType;
import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticleStream;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Mth;
@ -175,8 +176,8 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
if (this.connectionOffset != null)
compound.putLong("connection", this.connectionOffset.asLong());
@ -189,8 +190,8 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
if (compound.contains("connection"))
this.connectionOffset = BlockPos.of(compound.getLong("connection"));

11
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFlowerGenerator.java
View file

@ -7,6 +7,7 @@ import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticleStream;
import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
@ -96,8 +97,8 @@ public class BlockEntityFlowerGenerator extends BlockEntityImpl implements ITick
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.SYNC && !this.consumedRecently.isEmpty()) {
var list = new ListTag();
@ -115,14 +116,14 @@ public class BlockEntityFlowerGenerator extends BlockEntityImpl implements ITick
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.SYNC) {
this.consumedRecently.clear();
var list = compound.getList("consumed_recently", 10);
for (var base : list) {
var tag = (CompoundTag) base;
var block = BuiltInRegistries.BLOCK.get(new ResourceLocation(tag.getString("block")));
var block = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(tag.getString("block")));
if (block != null)
this.consumedRecently.put(block.defaultBlockState(), new MutableInt(tag.getInt("amount")));
}

13
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFurnaceHeater.java
View file

@ -8,11 +8,13 @@ import de.ellpeck.naturesaura.blocks.BlockFurnaceHeater;
import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticleStream;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Mth;
import net.minecraft.world.inventory.ContainerData;
import net.minecraft.world.item.crafting.AbstractCookingRecipe;
import net.minecraft.world.item.crafting.RecipeType;
import net.minecraft.world.item.crafting.SingleRecipeInput;
import net.minecraft.world.level.block.AbstractFurnaceBlock;
import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
import net.minecraft.world.level.block.entity.BlastFurnaceBlockEntity;
@ -102,7 +104,7 @@ public class BlockEntityFurnaceHeater extends BlockEntityImpl implements ITickab
var input = furnace.getItem(0);
if (!input.isEmpty()) {
var recipe = this.level.getRecipeManager().getRecipeFor(BlockEntityFurnaceHeater.getRecipeType(furnace), furnace, this.level).orElse(null);
var recipe = this.level.getRecipeManager().getRecipeFor(BlockEntityFurnaceHeater.getRecipeType(furnace), new SingleRecipeInput(input), this.level).orElse(null);
if (recipe == null)
return false;
var output = recipe.value().getResultItem(this.level.registryAccess());
@ -113,16 +115,16 @@ public class BlockEntityFurnaceHeater extends BlockEntityImpl implements ITickab
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type == SaveType.SYNC)
compound.putBoolean("active", this.isActive);
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type == SaveType.SYNC)
this.isActive = compound.getBoolean("active");
@ -132,4 +134,5 @@ public class BlockEntityFurnaceHeater extends BlockEntityImpl implements ITickab
public boolean allowsLowerLimiter() {
return true;
}
}

14
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java
View file

@ -4,6 +4,7 @@ import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.blocks.BlockGratedChute;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.item.ItemStack;
@ -119,24 +120,23 @@ public class BlockEntityGratedChute extends BlockEntityImpl implements ITickable
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
compound.putInt("cooldown", this.cooldown);
compound.put("items", this.items.serializeNBT());
compound.put("items", this.items.serializeNBT(registries));
compound.putBoolean("blacklist", this.isBlacklist);
}
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
this.cooldown = compound.getInt("cooldown");
this.items.deserializeNBT(compound.getCompound("items"));
this.items.deserializeNBT(registries, compound.getCompound("items"));
this.isBlacklist = compound.getBoolean("blacklist");
}
}
}

38
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityImpl.java
View file

@ -4,6 +4,7 @@ import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.blocks.ModBlocks;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
@ -25,25 +26,25 @@ public class BlockEntityImpl extends BlockEntity {
}
@Override
public void saveAdditional(CompoundTag compound) {
this.writeNBT(compound, SaveType.TILE);
public void saveAdditional(CompoundTag compound, HolderLookup.Provider registries) {
this.writeNBT(compound, SaveType.TILE, registries);
}
@Override
public void load(CompoundTag compound) {
this.readNBT(compound, SaveType.TILE);
protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) {
this.readNBT(tag, SaveType.TILE, registries);
}
public void writeNBT(CompoundTag compound, SaveType type) {
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
if (type != SaveType.BLOCK) {
super.saveAdditional(compound);
super.saveAdditional(compound, registries);
compound.putInt("redstone", this.redstonePower);
}
}
public void readNBT(CompoundTag compound, SaveType type) {
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
if (type != SaveType.BLOCK) {
super.load(compound);
super.loadWithComponents(compound, registries);
this.redstonePower = compound.getInt("redstone");
}
}
@ -54,29 +55,28 @@ public class BlockEntityImpl extends BlockEntity {
@Override
public final ClientboundBlockEntityDataPacket getUpdatePacket() {
return ClientboundBlockEntityDataPacket.create(this, e -> {
return ClientboundBlockEntityDataPacket.create(this, (e, r) -> {
var compound = new CompoundTag();
this.writeNBT(compound, SaveType.SYNC);
this.writeNBT(compound, SaveType.SYNC, r);
return compound;
});
}
@Override
public final CompoundTag getUpdateTag() {
public final CompoundTag getUpdateTag(HolderLookup.Provider registries) {
var compound = new CompoundTag();
this.writeNBT(compound, SaveType.SYNC);
this.writeNBT(compound, SaveType.SYNC, registries);
return compound;
}
@Override
public void handleUpdateTag(CompoundTag tag) {
this.readNBT(tag, SaveType.SYNC);
public void handleUpdateTag(CompoundTag tag, HolderLookup.Provider registries) {
this.readNBT(tag, SaveType.SYNC, registries);
}
@Override
public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket pkt) {
super.onDataPacket(net, pkt);
this.readNBT(pkt.getTag(), SaveType.SYNC);
public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket pkt, HolderLookup.Provider registries) {
this.readNBT(pkt.getTag(), SaveType.SYNC, registries);
}
public void sendToClients() {
@ -102,7 +102,7 @@ public class BlockEntityImpl extends BlockEntity {
public void modifyDrop(ItemStack regularItem) {
var compound = new CompoundTag();
this.writeNBT(compound, SaveType.BLOCK);
this.writeNBT(compound, SaveType.BLOCK, this.getLevel().registryAccess());
if (!compound.isEmpty()) {
if (!regularItem.hasTag())
regularItem.setTag(new CompoundTag());
@ -114,7 +114,7 @@ public class BlockEntityImpl extends BlockEntity {
if (stack.hasTag()) {
var compound = stack.getTag().getCompound("data");
if (compound != null)
this.readNBT(compound, SaveType.BLOCK);
this.readNBT(compound, SaveType.BLOCK, this.level.registryAccess());
}
}

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java
View file

@ -2,6 +2,7 @@ package de.ellpeck.naturesaura.blocks.tiles;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.state.BlockState;
@ -83,8 +84,8 @@ public class BlockEntityItemDistributor extends BlockEntityImpl implements ITick
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type == SaveType.TILE) {
compound.putInt("cooldown", this.cooldown);
compound.putInt("side", this.currentSide.ordinal());
@ -94,8 +95,8 @@ public class BlockEntityItemDistributor extends BlockEntityImpl implements ITick
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type == SaveType.TILE) {
this.cooldown = compound.getInt("cooldown");
this.currentSide = Direction.values()[compound.getInt("side")];

18
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java
View file

@ -3,7 +3,6 @@ package de.ellpeck.naturesaura.blocks.tiles;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.api.aura.container.BasicAuraContainer;
import de.ellpeck.naturesaura.api.aura.container.IAuraContainer;
import de.ellpeck.naturesaura.api.aura.type.IAuraType;
import de.ellpeck.naturesaura.blocks.multi.Multiblocks;
import de.ellpeck.naturesaura.packet.PacketHandler;
@ -12,7 +11,7 @@ import de.ellpeck.naturesaura.packet.PacketParticles;
import de.ellpeck.naturesaura.recipes.AltarRecipe;
import de.ellpeck.naturesaura.recipes.ModRecipes;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvents;
@ -24,7 +23,6 @@ import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.level.block.state.BlockState;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.neoforge.items.IItemHandlerModifiable;
import net.neoforged.neoforge.items.ItemStackHandler;
public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickableBlockEntity {
@ -215,10 +213,10 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
compound.put("items", this.items.serializeNBT());
compound.put("items", this.items.serializeNBT(registries));
compound.putBoolean("complete", this.isComplete);
this.container.writeNBT(compound);
}
@ -232,17 +230,17 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable
@SuppressWarnings("unchecked")
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
this.items.deserializeNBT(compound.getCompound("items"));
this.items.deserializeNBT(registries, compound.getCompound("items"));
this.isComplete = compound.getBoolean("complete");
this.container.readNBT(compound);
}
if (type == SaveType.TILE) {
if (compound.contains("recipe")) {
if (this.hasLevel())
this.currentRecipe = (RecipeHolder<AltarRecipe>) this.level.getRecipeManager().byKey(new ResourceLocation(compound.getString("recipe"))).orElse(null);
this.currentRecipe = (RecipeHolder<AltarRecipe>) this.level.getRecipeManager().byKey(ResourceLocation.parse(compound.getString("recipe"))).orElse(null);
this.timer = compound.getInt("timer");
}
}

17
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOfferingTable.java
View file

@ -7,6 +7,7 @@ import de.ellpeck.naturesaura.packet.PacketParticles;
import de.ellpeck.naturesaura.recipes.ModRecipes;
import de.ellpeck.naturesaura.recipes.OfferingRecipe;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.world.entity.EntityType;
@ -105,31 +106,31 @@ public class BlockEntityOfferingTable extends BlockEntityImpl implements ITickab
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
compound.put("items", this.items.serializeNBT());
compound.put("items", this.items.serializeNBT(registries));
if (type != SaveType.SYNC) {
var list = new ListTag();
for (var stack : this.itemsToSpawn)
list.add(stack.save(new CompoundTag()));
list.add(stack.save(registries, new CompoundTag()));
compound.put("items_to_spawn", list);
}
}
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
this.items.deserializeNBT(compound.getCompound("items"));
this.items.deserializeNBT(registries, compound.getCompound("items"));
if (type != SaveType.SYNC) {
this.itemsToSpawn.clear();
var list = compound.getList("items_to_spawn", 10);
for (var base : list)
this.itemsToSpawn.add(ItemStack.of((CompoundTag) base));
this.itemsToSpawn.add(ItemStack.parseOptional(registries, (CompoundTag) base));
}
}
}

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityProjectileGenerator.java
View file

@ -2,6 +2,7 @@ package de.ellpeck.naturesaura.blocks.tiles;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.block.state.BlockState;
@ -14,15 +15,15 @@ public class BlockEntityProjectileGenerator extends BlockEntityImpl {
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK)
compound.putInt("next_side", this.nextSide.ordinal());
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK)
this.nextSide = Direction.values()[compound.getInt("next_side")];
}

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java
View file

@ -7,6 +7,7 @@ import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Mth;
import net.minecraft.world.level.block.state.BlockState;
@ -23,14 +24,14 @@ public class BlockEntityRFConverter extends BlockEntityImpl implements ITickable
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
compound.putInt("energy", this.storage.getEnergyStored());
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
this.storage.setEnergy(compound.getInt("energy"));
}

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySlimeSplitGenerator.java
View file

@ -3,6 +3,7 @@ package de.ellpeck.naturesaura.blocks.tiles;
import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.entity.monster.MagmaCube;
import net.minecraft.world.entity.monster.Slime;
@ -52,8 +53,8 @@ public class BlockEntitySlimeSplitGenerator extends BlockEntityImpl implements I
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type == SaveType.TILE) {
compound.putInt("timer", this.generationTimer);
compound.putInt("amount", this.amountToRelease);
@ -62,8 +63,8 @@ public class BlockEntitySlimeSplitGenerator extends BlockEntityImpl implements I
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type == SaveType.TILE) {
this.generationTimer = compound.getInt("timer");
this.amountToRelease = compound.getInt("amount");

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySnowCreator.java
View file

@ -5,6 +5,7 @@ import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.Entity;
@ -96,15 +97,15 @@ public class BlockEntitySnowCreator extends BlockEntityImpl implements ITickable
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type == SaveType.TILE)
compound.putInt("snowman_count", this.snowmanCount);
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type == SaveType.TILE)
this.snowmanCount = compound.getInt("snowman_count");
}

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityTimeChanger.java
View file

@ -6,6 +6,7 @@ import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.api.aura.type.IAuraType;
import de.ellpeck.naturesaura.items.ModItems;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.protocol.game.ClientboundSetTimePacket;
import net.minecraft.server.level.ServerLevel;
@ -106,15 +107,15 @@ public class BlockEntityTimeChanger extends BlockEntityImpl implements ITickable
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK)
compound.putLong("goal", this.goalTime);
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK)
this.goalTime = compound.getLong("goal");
}

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWeatherChanger.java
View file

@ -5,6 +5,7 @@ import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.api.misc.WeatherType;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Mth;
@ -88,8 +89,8 @@ public class BlockEntityWeatherChanger extends BlockEntityImpl implements ITicka
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
compound.putInt("time", this.processTime);
if (this.type != null)
@ -99,8 +100,8 @@ public class BlockEntityWeatherChanger extends BlockEntityImpl implements ITicka
}
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK) {
this.processTime = compound.getInt("time");
this.type = WeatherType.values()[compound.getInt("weather")];

15
src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWoodStand.java
View file

@ -7,6 +7,7 @@ import de.ellpeck.naturesaura.packet.PacketParticleStream;
import de.ellpeck.naturesaura.packet.PacketParticles;
import de.ellpeck.naturesaura.recipes.TreeRitualRecipe;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvents;
@ -154,10 +155,10 @@ public class BlockEntityWoodStand extends BlockEntityImpl implements ITickableBl
}
@Override
public void writeNBT(CompoundTag compound, SaveType type) {
super.writeNBT(compound, type);
public void writeNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.writeNBT(compound, type, registries);
if (type != SaveType.BLOCK)
compound.put("items", this.items.serializeNBT());
compound.put("items", this.items.serializeNBT(registries));
if (type == SaveType.TILE) {
if (this.ritualPos != null && this.recipe != null) {
@ -170,17 +171,17 @@ public class BlockEntityWoodStand extends BlockEntityImpl implements ITickableBl
@SuppressWarnings("unchecked")
@Override
public void readNBT(CompoundTag compound, SaveType type) {
super.readNBT(compound, type);
public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) {
super.readNBT(compound, type, registries);
if (type != SaveType.BLOCK)
this.items.deserializeNBT(compound.getCompound("items"));
this.items.deserializeNBT(registries, compound.getCompound("items"));
if (type == SaveType.TILE) {
if (compound.contains("recipe")) {
this.ritualPos = BlockPos.of(compound.getLong("ritual_pos"));
this.timer = compound.getInt("timer");
if (this.hasLevel())
this.recipe = (RecipeHolder<TreeRitualRecipe>) this.level.getRecipeManager().byKey(new ResourceLocation(compound.getString("recipe"))).orElse(null);
this.recipe = (RecipeHolder<TreeRitualRecipe>) this.level.getRecipeManager().byKey(ResourceLocation.parse(compound.getString("recipe"))).orElse(null);
}
}
}

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderAuraTimer.java
View file

@ -16,11 +16,12 @@ import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FastColor;
import net.neoforged.neoforge.capabilities.Capabilities;
public class RenderAuraTimer implements BlockEntityRenderer<BlockEntityAuraTimer> {
private static final ResourceLocation RES = new ResourceLocation(NaturesAura.MOD_ID, "textures/models/aura_timer_aura.png");
private static final ResourceLocation RES = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/models/aura_timer_aura.png");
private final AuraModel model = new AuraModel();
public RenderAuraTimer(BlockEntityRendererProvider.Context context) {
@ -41,7 +42,7 @@ public class RenderAuraTimer implements BlockEntityRenderer<BlockEntityAuraTimer
var r = (type.getColor() >> 16 & 255) / 255F;
var g = (type.getColor() >> 8 & 255) / 255F;
var b = (type.getColor() & 255) / 255F;
this.model.renderToBuffer(stack, buffer.getBuffer(this.model.renderType(RenderAuraTimer.RES)), combinedLightIn, combinedOverlayIn, r, g, b, 0.75F);
this.model.renderToBuffer(stack, buffer.getBuffer(this.model.renderType(RenderAuraTimer.RES)), combinedLightIn, combinedOverlayIn, FastColor.ARGB32.colorFromFloat(r, g, b, 0.75F));
stack.popPose();
}
@ -59,8 +60,8 @@ public class RenderAuraTimer implements BlockEntityRenderer<BlockEntityAuraTimer
}
@Override
public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
this.model.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int color) {
this.model.render(poseStack, buffer, packedLight, packedOverlay, color);
}
}

9
src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderEnderCrate.java
View file

@ -26,10 +26,10 @@ public class RenderEnderCrate implements BlockEntityRenderer<BlockEntityEnderCra
}
private static void renderFace(Matrix4f p_173696_, VertexConsumer p_173697_, float p_173700_, float p_173701_) {
p_173697_.vertex(p_173696_, (float) 1 / 16F, p_173700_, (float) 15 / 16F).endVertex();
p_173697_.vertex(p_173696_, (float) 15 / 16F, p_173700_, (float) 15 / 16F).endVertex();
p_173697_.vertex(p_173696_, (float) 15 / 16F, p_173701_, (float) 1 / 16F).endVertex();
p_173697_.vertex(p_173696_, (float) 1 / 16F, p_173701_, (float) 1 / 16F).endVertex();
p_173697_.addVertex(p_173696_, (float) 1 / 16F, p_173700_, (float) 15 / 16F);
p_173697_.addVertex(p_173696_, (float) 15 / 16F, p_173700_, (float) 15 / 16F);
p_173697_.addVertex(p_173696_, (float) 15 / 16F, p_173701_, (float) 1 / 16F);
p_173697_.addVertex(p_173696_, (float) 1 / 16F, p_173701_, (float) 1 / 16F);
}
private static float getOffsetUp() {
@ -39,4 +39,5 @@ public class RenderEnderCrate implements BlockEntityRenderer<BlockEntityEnderCra
private static RenderType renderType() {
return RenderType.endPortal();
}
}

11
src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderGeneratorLimitRemover.java
View file

@ -17,13 +17,14 @@ import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FastColor;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class RenderGeneratorLimitRemover implements BlockEntityRenderer<BlockEntityGeneratorLimitRemover> {
private static final ResourceLocation RES = new ResourceLocation(NaturesAura.MOD_ID, "textures/models/generator_limit_remover_glint.png");
private static final ResourceLocation RES = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/models/generator_limit_remover_glint.png");
private final ModelLimitRemoverGlint model = new ModelLimitRemoverGlint();
public RenderGeneratorLimitRemover(BlockEntityRendererProvider.Context context) {
@ -46,7 +47,7 @@ public class RenderGeneratorLimitRemover implements BlockEntityRenderer<BlockEnt
stack.translate(-0.002F + xOff, 1 + 0.002F + yOff, 1 + 0.002F + zOff);
stack.mulPose(Axis.XP.rotationDegrees(180F));
stack.scale(1.004F, 1.004F, 1.004F);
model.renderToBuffer(stack, buffer.getBuffer(model.renderType(texture)), brightness, combinedOverlayIn, 1, 1, 1, alpha * maxAlpha);
model.renderToBuffer(stack, buffer.getBuffer(model.renderType(texture)), brightness, combinedOverlayIn, FastColor.ARGB32.colorFromFloat(1, 1, 1, alpha * maxAlpha));
stack.popPose();
}
@ -63,8 +64,10 @@ public class RenderGeneratorLimitRemover implements BlockEntityRenderer<BlockEnt
}
@Override
public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
this.model.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
this.model.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
}
}
}

2
src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderLowerLimiter.java
View file

@ -17,7 +17,7 @@ import static de.ellpeck.naturesaura.blocks.tiles.render.RenderGeneratorLimitRem
@OnlyIn(Dist.CLIENT)
public class RenderLowerLimiter implements BlockEntityRenderer<BlockEntityLowerLimiter> {
private static final ResourceLocation RES = new ResourceLocation(NaturesAura.MOD_ID, "textures/models/lower_limiter_glint.png");
private static final ResourceLocation RES = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/models/lower_limiter_glint.png");
private final ModelLimitRemoverGlint model = new ModelLimitRemoverGlint();
public RenderLowerLimiter(BlockEntityRendererProvider.Context context) {}

11
src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderProjectileGenerator.java
View file

@ -17,13 +17,14 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FastColor;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class RenderProjectileGenerator implements BlockEntityRenderer<BlockEntityProjectileGenerator> {
private static final ResourceLocation RES = new ResourceLocation(NaturesAura.MOD_ID, "textures/models/projectile_generator_overlay.png");
private static final ResourceLocation RES = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/models/projectile_generator_overlay.png");
private final ModelOverlay model = new ModelOverlay();
public RenderProjectileGenerator(BlockEntityRendererProvider.Context context) {
@ -46,7 +47,7 @@ public class RenderProjectileGenerator implements BlockEntityRenderer<BlockEntit
stack.translate(-0.002F, 0, 0);
}
var brightness = 15 << 20 | 15 << 4;
this.model.renderToBuffer(stack, buffer.getBuffer(this.model.renderType(RenderProjectileGenerator.RES)), brightness, combinedOverlayIn, 1, 1, 1, 1);
this.model.renderToBuffer(stack, buffer.getBuffer(this.model.renderType(RenderProjectileGenerator.RES)), brightness, combinedOverlayIn, FastColor.ARGB32.colorFromFloat(1, 1, 1, 1));
stack.popPose();
}
@ -63,8 +64,10 @@ public class RenderProjectileGenerator implements BlockEntityRenderer<BlockEntit
}
@Override
public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
this.model.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
this.model.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
}
}
}

3
src/main/java/de/ellpeck/naturesaura/chunk/effect/AngerEffect.java
View file

@ -19,7 +19,7 @@ import net.minecraft.world.phys.AABB;
public class AngerEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "anger");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "anger");
private AABB bb;
@ -77,4 +77,5 @@ public class AngerEffect implements IDrainSpotEffect {
public ResourceLocation getName() {
return AngerEffect.NAME;
}
}

3
src/main/java/de/ellpeck/naturesaura/chunk/effect/AnimalEffect.java
View file

@ -27,7 +27,7 @@ import java.util.Comparator;
public class AnimalEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "animal");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "animal");
private int chance;
private AABB bb;
@ -150,4 +150,5 @@ public class AnimalEffect implements IDrainSpotEffect {
public ResourceLocation getName() {
return AnimalEffect.NAME;
}
}

2
src/main/java/de/ellpeck/naturesaura/chunk/effect/BalanceEffect.java
View file

@ -13,7 +13,7 @@ import org.apache.commons.lang3.mutable.MutableInt;
public class BalanceEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "balance");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "balance");
@Override
public void update(Level level, LevelChunk chunk, IAuraChunk auraChunk, BlockPos pos, Integer spot, AuraChunk.DrainSpot actualSpot) {

6
src/main/java/de/ellpeck/naturesaura/chunk/effect/BreathlessEffect.java
View file

@ -8,6 +8,7 @@ import de.ellpeck.naturesaura.api.aura.type.IAuraType;
import de.ellpeck.naturesaura.chunk.AuraChunk;
import de.ellpeck.naturesaura.potion.ModPotions;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Holder;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraft.world.effect.MobEffectInstance;
@ -21,7 +22,7 @@ import net.minecraft.world.phys.AABB;
public class BreathlessEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "breathless");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "breathless");
private int amp;
private AABB bb;
@ -62,7 +63,7 @@ public class BreathlessEffect implements IDrainSpotEffect {
return;
var entities = level.getEntitiesOfClass(LivingEntity.class, this.bb);
for (var entity : entities)
entity.addEffect(new MobEffectInstance(ModPotions.BREATHLESS, 300, this.amp));
entity.addEffect(new MobEffectInstance(Holder.direct(ModPotions.BREATHLESS), 300, this.amp));
}
@Override
@ -74,4 +75,5 @@ public class BreathlessEffect implements IDrainSpotEffect {
public ResourceLocation getName() {
return BreathlessEffect.NAME;
}
}

3
src/main/java/de/ellpeck/naturesaura/chunk/effect/CacheRechargeEffect.java
View file

@ -19,7 +19,7 @@ import net.minecraft.world.phys.AABB;
public class CacheRechargeEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "cache_recharge");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "cache_recharge");
private int amount;
private AABB bb;
@ -77,4 +77,5 @@ public class CacheRechargeEffect implements IDrainSpotEffect {
public ResourceLocation getName() {
return CacheRechargeEffect.NAME;
}
}

2
src/main/java/de/ellpeck/naturesaura/chunk/effect/ExplosionEffect.java
View file

@ -20,7 +20,7 @@ import net.neoforged.neoforge.event.EventHooks;
public class ExplosionEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "explosions");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "explosions");
private float strength;
private int dist;

3
src/main/java/de/ellpeck/naturesaura/chunk/effect/GrassDieEffect.java
View file

@ -23,7 +23,7 @@ import net.minecraft.world.level.chunk.LevelChunk;
public class GrassDieEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "grass_die");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "grass_die");
private int amount;
private int dist;
@ -96,4 +96,5 @@ public class GrassDieEffect implements IDrainSpotEffect {
public ResourceLocation getName() {
return GrassDieEffect.NAME;
}
}

3
src/main/java/de/ellpeck/naturesaura/chunk/effect/NetherDecayEffect.java
View file

@ -23,7 +23,7 @@ import net.minecraft.world.level.chunk.LevelChunk;
public class NetherDecayEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "nether_decay");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "nether_decay");
private int amount;
private int dist;
@ -101,4 +101,5 @@ public class NetherDecayEffect implements IDrainSpotEffect {
public ResourceLocation getName() {
return NetherDecayEffect.NAME;
}
}

5
src/main/java/de/ellpeck/naturesaura/chunk/effect/NetherGrassEffect.java
View file

@ -22,7 +22,7 @@ import net.neoforged.neoforge.common.Tags;
public class NetherGrassEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "nether_grass");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "nether_grass");
private int amount;
private int dist;
@ -78,7 +78,7 @@ public class NetherGrassEffect implements IDrainSpotEffect {
continue;
var state = level.getBlockState(goalPos);
if (state.is(Tags.Blocks.NETHERRACK)) {
if (state.is(Tags.Blocks.NETHERRACKS)) {
level.setBlockAndUpdate(goalPos, ModBlocks.NETHER_GRASS.defaultBlockState());
var closestSpot = IAuraChunk.getHighestSpot(level, goalPos, 25, pos);
@ -102,4 +102,5 @@ public class NetherGrassEffect implements IDrainSpotEffect {
public ResourceLocation getName() {
return NetherGrassEffect.NAME;
}
}

2
src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java
View file

@ -39,7 +39,7 @@ import java.util.Set;
public class OreSpawnEffect implements IDrainSpotEffect {
public static final Set<BlockState> SPAWN_EXCEPTIONS = new HashSet<>();
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "ore_spawn");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "ore_spawn");
private int amount;
private int dist;

3
src/main/java/de/ellpeck/naturesaura/chunk/effect/PlantBoostEffect.java
View file

@ -28,7 +28,7 @@ import java.util.Set;
public class PlantBoostEffect implements IDrainSpotEffect {
public static final Set<Block> EXCEPTIONS = new HashSet<>(List.of(Blocks.GRASS_BLOCK, Blocks.MOSS_BLOCK, Blocks.GLOW_LICHEN, Blocks.SMALL_DRIPLEAF, Blocks.BIG_DRIPLEAF, Blocks.BIG_DRIPLEAF_STEM));
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "plant_boost");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "plant_boost");
private int amount;
private int dist;
@ -106,4 +106,5 @@ public class PlantBoostEffect implements IDrainSpotEffect {
public ResourceLocation getName() {
return PlantBoostEffect.NAME;
}
}

2
src/main/java/de/ellpeck/naturesaura/chunk/effect/ReplenishingEffect.java
View file

@ -18,7 +18,7 @@ import java.util.List;
public class ReplenishingEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "replenishing");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "replenishing");
@Override
public void update(Level level, LevelChunk chunk, IAuraChunk auraChunk, BlockPos pos, Integer spot, AuraChunk.DrainSpot actualSpot) {

2
src/main/java/de/ellpeck/naturesaura/chunk/effect/SpreadEffect.java
View file

@ -14,7 +14,7 @@ import net.minecraft.world.level.chunk.LevelChunk;
public class SpreadEffect implements IDrainSpotEffect {
public static final ResourceLocation NAME = new ResourceLocation(NaturesAura.MOD_ID, "spread");
public static final ResourceLocation NAME = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "spread");
@Override
public void update(Level level, LevelChunk chunk, IAuraChunk auraChunk, BlockPos pos, Integer spot, AuraChunk.DrainSpot actualSpot) {

3
src/main/java/de/ellpeck/naturesaura/compat/Compat.java
View file

@ -19,7 +19,8 @@ public final class Compat {
@SuppressWarnings("Convert2MethodRef") // bleh classloading compat issues
private static final Map<String, Supplier<ICompat>> MODULE_TYPES = ImmutableMap.<String, Supplier<ICompat>>builder()
.put("patchouli", () -> new PatchouliCompat())
.put("curios", () -> new CuriosCompat())
// TODO curios?
//.put("curios", () -> new CuriosCompat())
//.put("enchantability", EnchantibilityCompat::new)
.build();
private static final Map<String, ICompat> MODULES = new HashMap<>();

3
src/main/java/de/ellpeck/naturesaura/compat/jei/AltarCategory.java
View file

@ -24,7 +24,7 @@ public class AltarCategory implements IRecipeCategory<AltarRecipe> {
private final ItemStack altar = new ItemStack(ModBlocks.NATURE_ALTAR);
public AltarCategory(IGuiHelper helper) {
this.background = helper.createDrawable(new ResourceLocation(NaturesAura.MOD_ID, "textures/gui/jei/altar.png"), 0, 0, 103, 57);
this.background = helper.createDrawable(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/gui/jei/altar.png"), 0, 0, 103, 57);
}
@Override
@ -53,4 +53,5 @@ public class AltarCategory implements IRecipeCategory<AltarRecipe> {
builder.addSlot(RecipeIngredientRole.OUTPUT, 81, 19).addItemStack(recipe.output);
builder.addSlot(RecipeIngredientRole.CATALYST, 38, 19).addItemStacks(recipe.catalyst == Ingredient.EMPTY ? Collections.singletonList(this.altar) : Arrays.asList(recipe.catalyst.getItems()));
}
}

10
src/main/java/de/ellpeck/naturesaura/compat/jei/AnimalSpawnerCategory.java
View file

@ -24,7 +24,6 @@ import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.SpawnEggItem;
import net.neoforged.neoforge.common.DeferredSpawnEggItem;
import java.util.Arrays;
import java.util.HashMap;
@ -36,15 +35,15 @@ public class AnimalSpawnerCategory implements IRecipeCategory<AnimalSpawnerRecip
private final Map<EntityType<?>, Entity> entityCache = new HashMap<>();
public AnimalSpawnerCategory(IGuiHelper helper) {
this.background = helper.createDrawable(new ResourceLocation(NaturesAura.MOD_ID, "textures/gui/jei/animal_spawner.png"), 0, 0, 72, 86);
this.background = helper.createDrawable(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/gui/jei/animal_spawner.png"), 0, 0, 72, 86);
}
private static void renderEntity(PoseStack matrixstack, int x, int y, float scale, float yaw, float pitch, LivingEntity entity) {
var f = (float) Math.atan(yaw / 40.0F);
var f1 = (float) Math.atan(pitch / 40.0F);
var posestack = RenderSystem.getModelViewStack();
posestack.pushPose();
posestack.translate(x, y, 1050.0D);
posestack.pushMatrix();
posestack.translate(x, y, 1050.0F);
posestack.scale(1.0F, 1.0F, -1.0F);
RenderSystem.applyModelViewMatrix();
matrixstack.translate(0.0D, 0.0D, 1000.0D);
@ -77,7 +76,7 @@ public class AnimalSpawnerCategory implements IRecipeCategory<AnimalSpawnerRecip
entity.setXRot(f4);
entity.yHeadRotO = f5;
entity.yHeadRot = f6;
posestack.popPose();
posestack.popMatrix();
RenderSystem.applyModelViewMatrix();
Lighting.setupFor3DItems();
}
@ -127,4 +126,5 @@ public class AnimalSpawnerCategory implements IRecipeCategory<AnimalSpawnerRecip
graphics.drawString(minecraft.font, name, 36 - minecraft.font.width(name) / 2F, 55, 0xFFFFFF, true);
}
}

51
src/main/java/de/ellpeck/naturesaura/compat/jei/JEINaturesAuraPlugin.java
View file

@ -10,7 +10,8 @@ import de.ellpeck.naturesaura.recipes.*;
import mezz.jei.api.IModPlugin;
import mezz.jei.api.JeiPlugin;
import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.ingredients.subtypes.IIngredientSubtypeInterpreter;
import mezz.jei.api.ingredients.subtypes.ISubtypeInterpreter;
import mezz.jei.api.ingredients.subtypes.UidContext;
import mezz.jei.api.recipe.RecipeType;
import mezz.jei.api.registration.IRecipeCatalystRegistration;
import mezz.jei.api.registration.IRecipeCategoryRegistration;
@ -20,6 +21,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.RecipeHolder;
import org.jetbrains.annotations.Nullable;
@JeiPlugin
public class JEINaturesAuraPlugin implements IModPlugin {
@ -31,7 +33,7 @@ public class JEINaturesAuraPlugin implements IModPlugin {
@Override
public ResourceLocation getPluginUid() {
return new ResourceLocation(NaturesAura.MOD_ID, "jei_plugin");
return ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "jei_plugin");
}
@Override
@ -47,17 +49,44 @@ public class JEINaturesAuraPlugin implements IModPlugin {
@Override
public void registerItemSubtypes(ISubtypeRegistration registration) {
registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, ModItems.EFFECT_POWDER, (stack, context) -> ItemEffectPowder.getEffect(stack).toString());
registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, ModItems.AURA_BOTTLE, (stack, context) -> ItemAuraBottle.getType(stack).getName().toString());
registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, ModItems.EFFECT_POWDER, new ISubtypeInterpreter<>() {
@Override
public @Nullable Object getSubtypeData(ItemStack ingredient, UidContext context) {
return ItemEffectPowder.getEffect(ingredient);
}
var auraInterpreter = (IIngredientSubtypeInterpreter<ItemStack>) (stack, context) -> {
var container = stack.getCapability(NaturesAuraAPI.AURA_CONTAINER_ITEM_CAPABILITY);
if (container != null)
return String.valueOf(container.getStoredAura());
return IIngredientSubtypeInterpreter.NONE;
@Override
public String getLegacyStringSubtypeInfo(ItemStack ingredient, UidContext context) {
return ItemEffectPowder.getEffect(ingredient).toString();
}
});
registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, ModItems.AURA_BOTTLE, new ISubtypeInterpreter<>() {
@Override
public @Nullable Object getSubtypeData(ItemStack ingredient, UidContext context) {
return ItemAuraBottle.getType(ingredient).getName();
}
@Override
public String getLegacyStringSubtypeInfo(ItemStack ingredient, UidContext context) {
return ItemAuraBottle.getType(ingredient).getName().toString();
}
});
var auraInterpreter = new ISubtypeInterpreter<ItemStack>() {
@Override
public @Nullable Object getSubtypeData(ItemStack ingredient, UidContext context) {
var container = ingredient.getCapability(NaturesAuraAPI.AURA_CONTAINER_ITEM_CAPABILITY);
return container != null ? container.getStoredAura() : null;
}
@Override
public String getLegacyStringSubtypeInfo(ItemStack ingredient, UidContext context) {
var container = ingredient.getCapability(NaturesAuraAPI.AURA_CONTAINER_ITEM_CAPABILITY);
return container != null ? String.valueOf(container.getStoredAura()) : "";
}
};
registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, ModItems.AURA_CACHE, auraInterpreter);
registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, ModItems.AURA_TROVE, auraInterpreter);
registration.registerSubtypeInterpreter(ModItems.AURA_CACHE, auraInterpreter);
registration.registerSubtypeInterpreter(ModItems.AURA_TROVE, auraInterpreter);
}
@Override

3
src/main/java/de/ellpeck/naturesaura/compat/jei/OfferingCategory.java
View file

@ -19,7 +19,7 @@ public class OfferingCategory implements IRecipeCategory<OfferingRecipe> {
private final IDrawable background;
public OfferingCategory(IGuiHelper helper) {
this.background = helper.createDrawable(new ResourceLocation(NaturesAura.MOD_ID, "textures/gui/jei/offering.png"), 0, 0, 87, 36);
this.background = helper.createDrawable(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/gui/jei/offering.png"), 0, 0, 87, 36);
}
@Override
@ -48,4 +48,5 @@ public class OfferingCategory implements IRecipeCategory<OfferingRecipe> {
builder.addSlot(RecipeIngredientRole.OUTPUT, 66, 15).addItemStack(recipe.output);
builder.addSlot(RecipeIngredientRole.INPUT, 28, 1).addItemStacks(Arrays.asList(recipe.startItem.getItems()));
}
}

2
src/main/java/de/ellpeck/naturesaura/compat/jei/TreeRitualCategory.java
View file

@ -19,7 +19,7 @@ public class TreeRitualCategory implements IRecipeCategory<TreeRitualRecipe> {
private final IDrawable background;
public TreeRitualCategory(IGuiHelper helper) {
this.background = helper.createDrawable(new ResourceLocation(NaturesAura.MOD_ID, "textures/gui/jei/tree_ritual.png"), 0, 0, 146, 86);
this.background = helper.createDrawable(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/gui/jei/tree_ritual.png"), 0, 0, 146, 86);
}
@Override

21
src/main/java/de/ellpeck/naturesaura/compat/patchouli/PatchouliCompat.java
View file

@ -5,11 +5,11 @@ import de.ellpeck.naturesaura.ModConfig;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.multiblock.Matcher;
import de.ellpeck.naturesaura.compat.ICompat;
import de.ellpeck.naturesaura.data.ItemTagProvider;
import de.ellpeck.naturesaura.events.ClientEvents;
import de.ellpeck.naturesaura.renderers.SupporterFancyHandler;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.core.HolderLookup;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style;
import net.minecraft.resources.ResourceLocation;
@ -17,9 +17,9 @@ import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.crafting.Recipe;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.neoforged.neoforge.common.NeoForge;
import vazkii.patchouli.api.BookDrawScreenEvent;
import vazkii.patchouli.api.IMultiblock;
import vazkii.patchouli.api.IVariable;
@ -32,7 +32,7 @@ import java.util.stream.Collectors;
public class PatchouliCompat implements ICompat {
public static final ResourceLocation BOOK = new ResourceLocation(NaturesAura.MOD_ID, "book");
public static final ResourceLocation BOOK = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "book");
private static final Map<ResourceLocation, IMultiblock> MULTIBLOCKS = new HashMap<>();
public static void addPatchouliMultiblock(ResourceLocation name, String[][] pattern, Object... rawMatchers) {
@ -52,14 +52,13 @@ public class PatchouliCompat implements ICompat {
@SuppressWarnings("unchecked")
public static <T extends Recipe<?>> T getRecipe(String type, String name) {
var manager = Minecraft.getInstance().level.getRecipeManager();
var res = new ResourceLocation(name);
var pre = new ResourceLocation(res.getNamespace(), type + "/" + res.getPath());
var res = ResourceLocation.parse(name);
var pre = ResourceLocation.fromNamespaceAndPath(res.getNamespace(), type + "/" + res.getPath());
return (T) manager.byKey(pre).orElse(null).value();
}
public static IVariable ingredientVariable(Ingredient ingredient) {
return IVariable.wrapList(Arrays.stream(ingredient.getItems())
.map(IVariable::from).collect(Collectors.toList()));
public static IVariable ingredientVariable(Ingredient ingredient, HolderLookup.Provider registries) {
return IVariable.wrapList(Arrays.stream(ingredient.getItems()).map(i -> IVariable.from(i, registries)).collect(Collectors.toList()), registries);
}
@Override
@ -78,11 +77,6 @@ public class PatchouliCompat implements ICompat {
NeoForge.EVENT_BUS.register(this);
}
@Override
public void addItemTags(ItemTagProvider provider) {
}
@SubscribeEvent
@OnlyIn(Dist.CLIENT)
public void onBookDraw(BookDrawScreenEvent event) {
@ -139,4 +133,5 @@ public class PatchouliCompat implements ICompat {
}
}
}

10
src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAltar.java
View file

@ -13,7 +13,7 @@ public class ProcessorAltar implements IComponentProcessor {
@Override
public void setup(Level level, IVariableProvider provider) {
this.recipe = PatchouliCompat.getRecipe("altar", provider.get("recipe").asString());
this.recipe = PatchouliCompat.getRecipe("altar", provider.get("recipe", level.registryAccess()).asString());
}
@Override
@ -21,10 +21,10 @@ public class ProcessorAltar implements IComponentProcessor {
if (this.recipe == null)
return null;
return switch (key) {
case "input" -> PatchouliCompat.ingredientVariable(this.recipe.input);
case "output" -> IVariable.from(this.recipe.output);
case "catalyst" -> this.recipe.catalyst != Ingredient.EMPTY ? PatchouliCompat.ingredientVariable(this.recipe.catalyst) : null;
case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString());
case "input" -> PatchouliCompat.ingredientVariable(this.recipe.input, level.registryAccess());
case "output" -> IVariable.from(this.recipe.output, level.registryAccess());
case "catalyst" -> this.recipe.catalyst != Ingredient.EMPTY ? PatchouliCompat.ingredientVariable(this.recipe.catalyst, level.registryAccess()) : null;
case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString(), level.registryAccess());
default -> null;
};
}

10
src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAnimalSpawner.java
View file

@ -15,7 +15,7 @@ public class ProcessorAnimalSpawner implements IComponentProcessor {
@Override
public void setup(Level level, IVariableProvider provider) {
this.recipe = PatchouliCompat.getRecipe("animal_spawner", provider.get("recipe").asString());
this.recipe = PatchouliCompat.getRecipe("animal_spawner", provider.get("recipe", level.registryAccess()).asString());
}
@Override
@ -24,12 +24,12 @@ public class ProcessorAnimalSpawner implements IComponentProcessor {
return null;
if (key.startsWith("input")) {
var id = Integer.parseInt(key.substring(5)) - 1;
return this.recipe.ingredients.size() > id ? PatchouliCompat.ingredientVariable(this.recipe.ingredients.get(id)) : null;
return this.recipe.ingredients.size() > id ? PatchouliCompat.ingredientVariable(this.recipe.ingredients.get(id), level.registryAccess()) : null;
} else {
return switch (key) {
case "name" -> IVariable.wrap(this.recipe.entity.getDescription().getString());
case "entity" -> IVariable.wrap(BuiltInRegistries.ENTITY_TYPE.getKey(this.recipe.entity).toString());
case "egg" -> IVariable.from(new ItemStack(SpawnEggItem.byId(this.recipe.entity)));
case "name" -> IVariable.wrap(this.recipe.entity.getDescription().getString(), level.registryAccess());
case "entity" -> IVariable.wrap(BuiltInRegistries.ENTITY_TYPE.getKey(this.recipe.entity).toString(), level.registryAccess());
case "egg" -> IVariable.from(new ItemStack(SpawnEggItem.byId(this.recipe.entity)), level.registryAccess());
default -> null;
};
}

10
src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorOffering.java
View file

@ -12,7 +12,7 @@ public class ProcessorOffering implements IComponentProcessor {
@Override
public void setup(Level level, IVariableProvider provider) {
this.recipe = PatchouliCompat.getRecipe("offering", provider.get("recipe").asString());
this.recipe = PatchouliCompat.getRecipe("offering", provider.get("recipe", level.registryAccess()).asString());
}
@Override
@ -20,10 +20,10 @@ public class ProcessorOffering implements IComponentProcessor {
if (this.recipe == null)
return null;
return switch (key) {
case "input" -> PatchouliCompat.ingredientVariable(this.recipe.input);
case "output" -> IVariable.from(this.recipe.output);
case "start" -> PatchouliCompat.ingredientVariable(this.recipe.startItem);
case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString());
case "input" -> PatchouliCompat.ingredientVariable(this.recipe.input, level.registryAccess());
case "output" -> IVariable.from(this.recipe.output, level.registryAccess());
case "start" -> PatchouliCompat.ingredientVariable(this.recipe.startItem, level.registryAccess());
case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString(), level.registryAccess());
default -> null;
};
}

11
src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorTreeRitual.java
View file

@ -12,7 +12,7 @@ public class ProcessorTreeRitual implements IComponentProcessor {
@Override
public void setup(Level level, IVariableProvider provider) {
this.recipe = PatchouliCompat.getRecipe("tree_ritual", provider.get("recipe").asString());
this.recipe = PatchouliCompat.getRecipe("tree_ritual", provider.get("recipe", level.registryAccess()).asString());
}
@Override
@ -21,14 +21,15 @@ public class ProcessorTreeRitual implements IComponentProcessor {
return null;
if (key.startsWith("input")) {
var id = Integer.parseInt(key.substring(5)) - 1;
return this.recipe.ingredients.size() > id ? PatchouliCompat.ingredientVariable(this.recipe.ingredients.get(id)) : null;
return this.recipe.ingredients.size() > id ? PatchouliCompat.ingredientVariable(this.recipe.ingredients.get(id), level.registryAccess()) : null;
} else {
return switch (key) {
case "output" -> IVariable.from(this.recipe.output);
case "sapling" -> PatchouliCompat.ingredientVariable(this.recipe.saplingType);
case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString());
case "output" -> IVariable.from(this.recipe.output, level.registryAccess());
case "sapling" -> PatchouliCompat.ingredientVariable(this.recipe.saplingType, level.registryAccess());
case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString(), level.registryAccess());
default -> null;
};
}
}
}

14
src/main/java/de/ellpeck/naturesaura/data/BlockLootProvider.java
View file

@ -7,6 +7,7 @@ import de.ellpeck.naturesaura.blocks.Slab;
import de.ellpeck.naturesaura.items.ModItems;
import de.ellpeck.naturesaura.reg.ModRegistry;
import net.minecraft.advancements.critereon.StatePropertiesPredicate;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.loot.BlockLootSubProvider;
import net.minecraft.world.flag.FeatureFlags;
import net.minecraft.world.item.Items;
@ -25,8 +26,8 @@ import java.util.Set;
public class BlockLootProvider extends BlockLootSubProvider {
public BlockLootProvider() {
super(Set.of(), FeatureFlags.REGISTRY.allFlags());
public BlockLootProvider(HolderLookup.Provider registries) {
super(Set.of(), FeatureFlags.REGISTRY.allFlags(), registries);
}
@Override
@ -43,15 +44,16 @@ public class BlockLootProvider extends BlockLootSubProvider {
}
}
this.add(ModBlocks.ANCIENT_LEAVES, BlockLootProvider::createSilkTouchOnlyTable);
this.add(ModBlocks.DECAYED_LEAVES, BlockLootProvider::createSilkTouchOnlyTable);
this.add(ModBlocks.ANCIENT_LEAVES, this::createSilkTouchOnlyTable);
this.add(ModBlocks.DECAYED_LEAVES, this::createSilkTouchOnlyTable);
this.add(ModBlocks.GOLDEN_LEAVES, b -> LootTable.lootTable().withPool(LootPool.lootPool().setRolls(ConstantValue.exactly(1)).add(this.applyExplosionCondition(b, LootItem.lootTableItem(ModItems.GOLD_LEAF)).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(b).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(BlockGoldenLeaves.STAGE, BlockGoldenLeaves.HIGHEST_STAGE)))).when(LootItemRandomChanceCondition.randomChance(0.75F))));
this.add(ModBlocks.NETHER_WART_MUSHROOM, b -> BlockLootSubProvider.createSilkTouchDispatchTable(b, LootItem.lootTableItem(Items.NETHER_WART).apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))));
this.add(ModBlocks.NETHER_GRASS, b -> BlockLootSubProvider.createSilkTouchDispatchTable(b, LootItem.lootTableItem(Blocks.NETHERRACK)));
this.add(ModBlocks.NETHER_WART_MUSHROOM, b -> this.createSilkTouchDispatchTable(b, LootItem.lootTableItem(Items.NETHER_WART).apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))));
this.add(ModBlocks.NETHER_GRASS, b -> this.createSilkTouchDispatchTable(b, LootItem.lootTableItem(Blocks.NETHERRACK)));
}
@Override
protected Iterable<Block> getKnownBlocks() {
return ModRegistry.ALL_ITEMS.stream().filter(i -> i instanceof Block).map(i -> (Block) i).toList();
}
}

9
src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java
View file

@ -17,10 +17,10 @@ import java.util.concurrent.CompletableFuture;
public class BlockTagProvider extends BlockTagsProvider {
public static final TagKey<Block> ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_wood"));
public static final TagKey<Block> ALTAR_STONE = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_stone"));
public static final TagKey<Block> ALTAR_GOLD_BRICK = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_gold_brick"));
public static final TagKey<Block> ALTAR_FANCY_BRICK = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_fancy_brick"));
public static final TagKey<Block> ALTAR_WOOD = BlockTags.create(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "altar_wood"));
public static final TagKey<Block> ALTAR_STONE = BlockTags.create(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "altar_stone"));
public static final TagKey<Block> ALTAR_GOLD_BRICK = BlockTags.create(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "altar_gold_brick"));
public static final TagKey<Block> ALTAR_FANCY_BRICK = BlockTags.create(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "altar_fancy_brick"));
public BlockTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
super(output, lookupProvider, NaturesAura.MOD_ID, existingFileHelper);
@ -59,4 +59,5 @@ public class BlockTagProvider extends BlockTagsProvider {
ModBlocks.AUTO_CRAFTER, ModBlocks.FLOWER_GENERATOR, ModBlocks.NETHER_WART_MUSHROOM,
ModBlocks.OAK_GENERATOR, ModBlocks.OFFERING_TABLE, ModBlocks.WOOD_STAND);
}
}

3
src/main/java/de/ellpeck/naturesaura/data/ModData.java
View file

@ -13,7 +13,6 @@ import net.minecraft.data.registries.VanillaRegistries;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider;
import net.neoforged.neoforge.data.event.GatherDataEvent;
import net.neoforged.neoforge.registries.DataPackRegistriesHooks;
@ -38,7 +37,7 @@ public final class ModData {
var blockTags = new BlockTagProvider(out, lookup, existing);
gen.addProvider(event.includeServer(), blockTags);
gen.addProvider(event.includeServer(), new ItemTagProvider(out, lookup, blockTags.contentsGetter(), existing));
gen.addProvider(event.includeServer(), new LootTableProvider(out, Set.of(), List.of(new LootTableProvider.SubProviderEntry(BlockLootProvider::new, LootContextParamSets.BLOCK))));
gen.addProvider(event.includeServer(), new LootTableProvider(out, Set.of(), List.of(new LootTableProvider.SubProviderEntry(BlockLootProvider::new, LootContextParamSets.BLOCK)), lookup));
gen.addProvider(event.includeServer(), new BlockStateGenerator(out, existing));
gen.addProvider(event.includeServer(), new ItemModelGenerator(out, existing));
gen.addProvider(event.includeServer(), new DatapackBuiltinEntriesProvider(out, CompletableFuture.supplyAsync(ModData::getProvider), Set.of(NaturesAura.MOD_ID)));

2
src/main/java/de/ellpeck/naturesaura/enchant/AuraMendingEnchantment.java
View file

@ -3,8 +3,8 @@ package de.ellpeck.naturesaura.enchant;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.enchantment.Enchantment;
import net.minecraft.world.item.enchantment.EnchantmentCategory;
import net.minecraft.world.item.enchantment.Enchantments;
public class AuraMendingEnchantment extends ModEnchantment {

20
src/main/java/de/ellpeck/naturesaura/entities/EntityEffectInhibitor.java
View file

@ -51,23 +51,23 @@ public class EntityEffectInhibitor extends Entity implements IVisualizable {
}
@Override
public void onAddedToWorld() {
super.onAddedToWorld();
public void onAddedToLevel() {
super.onAddedToLevel();
this.powderListDirty = true;
}
@Override
public void onRemovedFromWorld() {
super.onRemovedFromWorld();
public void onRemovedFromLevel() {
super.onRemovedFromLevel();
// we pass a null effect because we want to remove our effect from the world
this.updatePowderListStatus(null);
}
@Override
protected void defineSynchedData() {
this.entityData.define(EntityEffectInhibitor.INHIBITED_EFFECT, "");
this.entityData.define(EntityEffectInhibitor.COLOR, 0);
this.entityData.define(EntityEffectInhibitor.AMOUNT, 0);
protected void defineSynchedData(SynchedEntityData.Builder builder) {
builder.define(EntityEffectInhibitor.INHIBITED_EFFECT, "");
builder.define(EntityEffectInhibitor.COLOR, 0);
builder.define(EntityEffectInhibitor.AMOUNT, 0);
}
@Override
@ -108,7 +108,7 @@ public class EntityEffectInhibitor extends Entity implements IVisualizable {
@Override
protected void readAdditionalSaveData(CompoundTag compound) {
this.setInhibitedEffect(new ResourceLocation(compound.getString("effect")));
this.setInhibitedEffect(ResourceLocation.parse(compound.getString("effect")));
this.setColor(compound.getInt("color"));
this.setAmount(compound.contains("amount") ? compound.getInt("amount") : 24);
}
@ -156,7 +156,7 @@ public class EntityEffectInhibitor extends Entity implements IVisualizable {
var effect = this.entityData.get(EntityEffectInhibitor.INHIBITED_EFFECT);
if (effect == null || effect.isEmpty())
return null;
return new ResourceLocation(effect);
return ResourceLocation.parse(effect);
}
public void setInhibitedEffect(ResourceLocation effect) {

5
src/main/java/de/ellpeck/naturesaura/entities/EntityLightProjectile.java
View file

@ -2,6 +2,7 @@ package de.ellpeck.naturesaura.entities;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.blocks.ModBlocks;
import net.minecraft.network.syncher.SynchedEntityData;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
@ -22,7 +23,7 @@ public class EntityLightProjectile extends ThrowableProjectile {
}
@Override
protected void defineSynchedData() {
protected void defineSynchedData(SynchedEntityData.Builder builder) {
}
@ -50,7 +51,7 @@ public class EntityLightProjectile extends ThrowableProjectile {
if (state.canBeReplaced())
this.level().setBlockAndUpdate(pos, ModBlocks.LIGHT.defaultBlockState());
} else if (result instanceof EntityHitResult entity) {
entity.getEntity().setSecondsOnFire(5);
entity.getEntity().setRemainingFireTicks(5 * 20);
}
}
this.discard();

19
src/main/java/de/ellpeck/naturesaura/entities/EntityMoverMinecart.java
View file

@ -9,7 +9,6 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.LongTag;
import net.minecraft.nbt.Tag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
@ -23,10 +22,9 @@ import net.minecraft.world.level.GameRules;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.portal.DimensionTransition;
import net.minecraft.world.phys.HitResult;
import net.neoforged.neoforge.common.util.ITeleporter;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
@ -113,8 +111,8 @@ public class EntityMoverMinecart extends Minecart {
}
@Override
public CompoundTag serializeNBT() {
var compound = super.serializeNBT();
protected void addAdditionalSaveData(CompoundTag compound) {
super.addAdditionalSaveData(compound);
compound.putBoolean("active", this.isActive);
compound.putLong("last_pos", this.lastPosition.asLong());
@ -122,12 +120,11 @@ public class EntityMoverMinecart extends Minecart {
for (var offset : this.spotOffsets)
list.add(LongTag.valueOf(offset.asLong()));
compound.put("offsets", list);
return compound;
}
@Override
public void deserializeNBT(CompoundTag compound) {
super.deserializeNBT(compound);
protected void readAdditionalSaveData(CompoundTag compound) {
super.readAdditionalSaveData(compound);
this.isActive = compound.getBoolean("active");
this.lastPosition = BlockPos.of(compound.getLong("last_pos"));
@ -137,10 +134,9 @@ public class EntityMoverMinecart extends Minecart {
this.spotOffsets.add(BlockPos.of(((LongTag) base).getAsLong()));
}
@Nullable
@Override
public Entity changeDimension(ServerLevel destination, ITeleporter teleporter) {
var entity = super.changeDimension(destination, teleporter);
public @org.jetbrains.annotations.Nullable Entity changeDimension(DimensionTransition transition) {
var entity = super.changeDimension(transition);
if (entity instanceof EntityMoverMinecart) {
var pos = entity.blockPosition();
this.moveAura(this.level(), this.lastPosition, entity.level(), pos);
@ -179,4 +175,5 @@ public class EntityMoverMinecart extends Minecart {
public InteractionResult interact(Player p_38483_, InteractionHand p_38484_) {
return InteractionResult.PASS;
}
}

6
src/main/java/de/ellpeck/naturesaura/entities/EntityStructureFinder.java
View file

@ -32,9 +32,9 @@ public class EntityStructureFinder extends EyeOfEnder {
}
@Override
protected void defineSynchedData() {
super.defineSynchedData();
this.entityData.define(EntityStructureFinder.COLOR, 0);
protected void defineSynchedData(SynchedEntityData.Builder builder) {
super.defineSynchedData(builder);
builder.define(EntityStructureFinder.COLOR, 0);
}
@Override

11
src/main/java/de/ellpeck/naturesaura/entities/render/RenderMoverMinecart.java
View file

@ -18,11 +18,12 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider;
import net.minecraft.client.renderer.entity.MinecartRenderer;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FastColor;
import net.minecraft.world.level.block.state.BlockState;
public class RenderMoverMinecart extends MinecartRenderer<EntityMoverMinecart> {
private static final ResourceLocation RES = new ResourceLocation(NaturesAura.MOD_ID, "textures/models/mover_cart.png");
private static final ResourceLocation RES = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/models/mover_cart.png");
public RenderMoverMinecart(EntityRendererProvider.Context p_174300_) {
super(p_174300_, ModelLayers.MINECART);
@ -36,7 +37,7 @@ public class RenderMoverMinecart extends MinecartRenderer<EntityMoverMinecart> {
matrixStackIn.translate(0, 22 / 16F, 0);
matrixStackIn.translate(0, 0, 1);
matrixStackIn.mulPose(Axis.XP.rotationDegrees(180));
this.model.renderToBuffer(matrixStackIn, bufferIn.getBuffer(this.model.renderType(RenderMoverMinecart.RES)), packedLightIn, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1);
this.model.renderToBuffer(matrixStackIn, bufferIn.getBuffer(this.model.renderType(RenderMoverMinecart.RES)), packedLightIn, OverlayTexture.NO_OVERLAY, FastColor.ARGB32.colorFromFloat(1, 1, 1, 1));
matrixStackIn.popPose();
}
@ -53,8 +54,10 @@ public class RenderMoverMinecart extends MinecartRenderer<EntityMoverMinecart> {
}
@Override
public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
this.model.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
this.model.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
}
}
}

67
src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java
View file

@ -2,10 +2,7 @@ package de.ellpeck.naturesaura.events;
import com.mojang.blaze3d.platform.Window;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.BufferBuilder;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.Tesselator;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.*;
import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.ModConfig;
import de.ellpeck.naturesaura.NaturesAura;
@ -40,15 +37,14 @@ import net.minecraft.world.level.block.MyceliumBlock;
import net.minecraft.world.phys.BlockHitResult;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.client.event.CustomizeGuiOverlayEvent;
import net.neoforged.neoforge.client.event.RenderGuiOverlayEvent;
import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
import net.neoforged.neoforge.client.gui.overlay.VanillaGuiOverlay;
import net.neoforged.neoforge.common.IPlantable;
import net.neoforged.neoforge.energy.EnergyStorage;
import net.neoforged.neoforge.event.TickEvent;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.client.event.ClientTickEvent;
import net.neoforged.neoforge.client.event.CustomizeGuiOverlayEvent;
import net.neoforged.neoforge.client.event.RenderGuiLayerEvent;
import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
import net.neoforged.neoforge.client.gui.VanillaGuiLayers;
import net.neoforged.neoforge.energy.EnergyStorage;
import org.apache.commons.lang3.mutable.MutableInt;
import java.text.NumberFormat;
@ -60,8 +56,8 @@ import java.util.Map;
@OnlyIn(Dist.CLIENT)
public class ClientEvents {
public static final ResourceLocation OVERLAYS = new ResourceLocation(NaturesAura.MOD_ID, "textures/gui/overlays.png");
public static final ResourceLocation BOOK_GUI = new ResourceLocation(NaturesAura.MOD_ID, "textures/gui/book.png");
public static final ResourceLocation OVERLAYS = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/gui/overlays.png");
public static final ResourceLocation BOOK_GUI = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/gui/book.png");
public static final List<PacketAuraChunk> PENDING_AURA_CHUNKS = new ArrayList<>();
private static final ItemStack ITEM_FRAME = new ItemStack(Items.ITEM_FRAME);
private static final ItemStack DISPENSER = new ItemStack(Blocks.DISPENSER);
@ -95,8 +91,7 @@ public class ClientEvents {
}
@SubscribeEvent
public void onClientTick(TickEvent.ClientTickEvent event) {
if (event.phase != TickEvent.Phase.END) {
public void onClientTick(ClientTickEvent.Post event) {
ClientEvents.heldCache = ItemStack.EMPTY;
ClientEvents.heldEye = ItemStack.EMPTY;
ClientEvents.heldOcular = ItemStack.EMPTY;
@ -118,7 +113,7 @@ public class ClientEvents {
var pos = Helper.getClosestAirAboveGround(mc.level, new BlockPos(x, y, z), 16).below();
var state = mc.level.getBlockState(pos);
var block = state.getBlock();
if (block instanceof BonemealableBlock || block instanceof IPlantable || block instanceof LeavesBlock || block instanceof MyceliumBlock) {
if (block instanceof BonemealableBlock || block instanceof LeavesBlock || block instanceof MyceliumBlock) {
var excess = IAuraChunk.triangulateAuraInArea(mc.level, pos, 45) - IAuraChunk.DEFAULT_AURA;
if (excess > 0) {
var chance = Math.max(10, 50 - excess / 25000);
@ -166,7 +161,6 @@ public class ClientEvents {
}
}
}
}
@SubscribeEvent
public void onLevelRender(RenderLevelStageEvent event) {
@ -175,15 +169,14 @@ public class ClientEvents {
var mc = Minecraft.getInstance();
var view = mc.gameRenderer.getMainCamera().getPosition();
var tesselator = Tesselator.getInstance();
var buffer = tesselator.getBuilder();
mc.getProfiler().push(NaturesAura.MOD_ID + ":onLevelRender");
RenderSystem.enableDepthTest();
var mv = RenderSystem.getModelViewStack();
mv.pushPose();
mv.mulPoseMatrix(event.getPoseStack().last().pose());
mv.translate(-view.x, -view.y, -view.z);
mv.pushMatrix();
mv.mul(event.getPoseStack().last().pose());
mv.translate((float) -view.x, (float) -view.y, (float) -view.z);
RenderSystem.applyModelViewMatrix();
RenderSystem.enableBlend();
RenderSystem.setShader(GameRenderer::getPositionColorShader);
@ -192,12 +185,12 @@ public class ClientEvents {
// aura spot debug
ClientEvents.hoveringAuraSpot = null;
if (mc.getDebugOverlay().showDebugScreen() && (mc.player.isCreative() || mc.player.isSpectator()) && ModConfig.instance.debugLevel.get()) {
var playerEye = mc.player.getEyePosition(event.getPartialTick());
var playerView = mc.player.getViewVector(event.getPartialTick()).normalize();
var range = mc.gameMode.getPickRange();
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
var playerEye = mc.player.getEyePosition(event.getPartialTick().getGameTimeDeltaPartialTick(true));
var playerView = mc.player.getViewVector(event.getPartialTick().getGameTimeDeltaPartialTick(true)).normalize();
var range = mc.gameMode.getDestroyStage();
var builder = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
IAuraChunk.getSpotsInArea(mc.level, mc.player.blockPosition(), 64, (pos, spot) -> {
Helper.renderWeirdBox(buffer, pos.getX(), pos.getY(), pos.getZ(), 1, 1, 1, spot > 0 ? 0F : 1F, spot > 0 ? 1F : 0F, 0F, 0.35F);
Helper.renderWeirdBox(builder, pos.getX(), pos.getY(), pos.getZ(), 1, 1, 1, spot > 0 ? 0F : 1F, spot > 0 ? 1F : 0F, 0F, 0.35F);
// dirty raytrace to see if we're looking at roughly this spot
if (playerEye.distanceToSqr(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5) <= range * range) {
for (var d = 0F; d <= range; d += 0.5F) {
@ -209,14 +202,14 @@ public class ClientEvents {
}
});
tesselator.end();
BufferUploader.drawWithShader(builder.build());
}
// range visualizer
if (Helper.isHoldingItem(mc.player, ModItems.RANGE_VISUALIZER)) {
RenderSystem.disableCull();
var dim = mc.level.dimension().location();
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
var builder = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
for (var pos : ItemRangeVisualizer.VISUALIZED_BLOCKS.get(dim)) {
if (!mc.level.isLoaded(pos))
continue;
@ -224,18 +217,18 @@ public class ClientEvents {
var block = state.getBlock();
if (!(block instanceof IVisualizable))
continue;
this.renderVisualize(buffer, (IVisualizable) block, mc.level, pos);
this.renderVisualize(builder, (IVisualizable) block, mc.level, pos);
}
for (var entity : ItemRangeVisualizer.VISUALIZED_ENTITIES.get(dim)) {
if (!entity.isAlive() || !(entity instanceof IVisualizable))
continue;
this.renderVisualize(buffer, (IVisualizable) entity, mc.level, entity.blockPosition());
this.renderVisualize(builder, (IVisualizable) entity, mc.level, entity.blockPosition());
}
tesselator.end();
BufferUploader.drawWithShader(builder.build());
RenderSystem.enableCull();
}
mv.popPose();
mv.popMatrix();
RenderSystem.applyModelViewMatrix();
RenderSystem.disableBlend();
@ -247,17 +240,17 @@ public class ClientEvents {
if (box != null) {
box = box.inflate(0.05F);
var color = visualize.getVisualizationColor(level, pos);
Helper.renderWeirdBox(buffer, box.minX, box.minY, box.minZ, box.maxX - box.minX, box.maxY - box.minY, box.maxZ - box.minZ, (color >> 16 & 255) / 255F, (color >> 8 & 255) / 255F, (color & 255) / 255F, 0.5F);
Helper.renderWeirdBox(buffer, (float) box.minX, (float) box.minY, (float) box.minZ, (float) (box.maxX - box.minX), (float) (box.maxY - box.minY), (float) (box.maxZ - box.minZ), (color >> 16 & 255) / 255F, (color >> 8 & 255) / 255F, (color & 255) / 255F, 0.5F);
}
}
@SubscribeEvent
public void onOverlayRender(RenderGuiOverlayEvent.Post event) {
public void onOverlayRender(RenderGuiLayerEvent.Post event) {
var mc = Minecraft.getInstance();
var graphics = event.getGuiGraphics();
var stack = graphics.pose();
if (event.getOverlay() == VanillaGuiOverlay.HOTBAR.type()) {
var res = event.getWindow();
if (event.getName() == VanillaGuiLayers.HOTBAR) {
var res = mc.getWindow();
if (mc.player != null) {
if (!ClientEvents.heldCache.isEmpty()) {
var container = ClientEvents.heldCache.getCapability(NaturesAuraAPI.AURA_CONTAINER_ITEM_CAPABILITY, null);

33
src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java
View file

@ -19,13 +19,14 @@ import net.minecraft.server.level.ServerChunkCache;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.chunk.LevelChunk;
import net.neoforged.neoforge.event.TickEvent;
import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
import net.neoforged.neoforge.event.level.ChunkEvent;
import net.neoforged.neoforge.event.level.ChunkWatchEvent;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.util.ObfuscationReflectionHelper;
import net.neoforged.neoforge.event.RegisterCommandsEvent;
import net.neoforged.neoforge.event.tick.LevelTickEvent;
import net.neoforged.neoforge.event.tick.PlayerTickEvent;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@ -65,12 +66,12 @@ public class CommonEvents {
@SubscribeEvent
@SuppressWarnings("unchecked")
public void onLevelTick(TickEvent.LevelTickEvent event) {
if (!event.level.isClientSide && event.phase == TickEvent.Phase.END) {
if (event.level.getGameTime() % 20 == 0) {
event.level.getProfiler().push(NaturesAura.MOD_ID + ":onLevelTick");
public void onLevelTick(LevelTickEvent.Post event) {
if (!event.getLevel().isClientSide) {
if (event.getLevel().getGameTime() % 20 == 0) {
event.getLevel().getProfiler().push(NaturesAura.MOD_ID + ":onLevelTick");
try {
var manager = ((ServerChunkCache) event.level.getChunkSource()).chunkMap;
var manager = ((ServerChunkCache) event.getLevel().getChunkSource()).chunkMap;
var chunks = (Iterable<ChunkHolder>) CommonEvents.GET_LOADED_CHUNKS_METHOD.invoke(manager);
for (var holder : chunks) {
var chunk = holder.getTickingChunk();
@ -83,27 +84,27 @@ public class CommonEvents {
} catch (IllegalAccessException | InvocationTargetException e) {
NaturesAura.LOGGER.fatal(e);
}
event.level.getProfiler().pop();
event.getLevel().getProfiler().pop();
}
}
}
@SubscribeEvent
public void onPlayerTick(TickEvent.PlayerTickEvent event) {
if (!event.player.level().isClientSide && event.phase == TickEvent.Phase.END) {
if (event.player.level().getGameTime() % 10 == 0) {
var pending = CommonEvents.PENDING_AURA_CHUNKS.get(event.player.getUUID());
pending.removeIf(p -> this.handleChunkWatchDeferred(event.player, p));
public void onPlayerTick(PlayerTickEvent.Post event) {
if (!event.getEntity().level().isClientSide) {
if (event.getEntity().level().getGameTime() % 10 == 0) {
var pending = CommonEvents.PENDING_AURA_CHUNKS.get(event.getEntity().getUUID());
pending.removeIf(p -> this.handleChunkWatchDeferred(event.getEntity(), p));
}
if (event.player.level().getGameTime() % 200 != 0)
if (event.getEntity().level().getGameTime() % 200 != 0)
return;
var aura = IAuraChunk.triangulateAuraInArea(event.player.level(), event.player.blockPosition(), 25);
var aura = IAuraChunk.triangulateAuraInArea(event.getEntity().level(), event.getEntity().blockPosition(), 25);
if (aura <= 0)
Helper.addAdvancement(event.player, new ResourceLocation(NaturesAura.MOD_ID, "negative_imbalance"), "triggered_in_code");
Helper.addAdvancement(event.getEntity(), ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "negative_imbalance"), "triggered_in_code");
else if (aura >= 1500000)
Helper.addAdvancement(event.player, new ResourceLocation(NaturesAura.MOD_ID, "positive_imbalance"), "triggered_in_code");
Helper.addAdvancement(event.getEntity(), ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "positive_imbalance"), "triggered_in_code");
}
}

49
src/main/java/de/ellpeck/naturesaura/gen/ModFeatures.java
View file

@ -1,9 +1,8 @@
package de.ellpeck.naturesaura.gen;
import de.ellpeck.naturesaura.NaturesAura;
import net.minecraft.core.HolderGetter;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.worldgen.BootstapContext;
import net.minecraft.data.worldgen.BootstrapContext;
import net.minecraft.data.worldgen.features.FeatureUtils;
import net.minecraft.data.worldgen.placement.PlacementUtils;
import net.minecraft.resources.ResourceKey;
@ -13,7 +12,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf
import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
@SuppressWarnings("NonConstantFieldWithUpperCaseName")
@SuppressWarnings({"NonConstantFieldWithUpperCaseName", "FieldNamingConvention"})
public final class ModFeatures {
public static Feature<TreeConfiguration> ANCIENT_TREE;
@ -26,16 +25,15 @@ public final class ModFeatures {
public static final class Configured {
public static ResourceKey<ConfiguredFeature<?, ?>> ANCIENT_TREE = FeatureUtils.createKey(NaturesAura.MOD_ID + ":ancient_tree");
public static ResourceKey<ConfiguredFeature<?, ?>> NETHER_WART_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":nether_wart_mushroom");
public static ResourceKey<ConfiguredFeature<?, ?>> AURA_BLOOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_bloom");
public static ResourceKey<ConfiguredFeature<?, ?>> AURA_CACTUS = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_cactus");
public static ResourceKey<ConfiguredFeature<?, ?>> WARPED_AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":warped_aura_mushroom");
public static ResourceKey<ConfiguredFeature<?, ?>> CRIMSON_AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":crimson_aura_mushroom");
public static ResourceKey<ConfiguredFeature<?, ?>> AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_mushroom");
public static final ResourceKey<ConfiguredFeature<?, ?>> ANCIENT_TREE = FeatureUtils.createKey(NaturesAura.MOD_ID + ":ancient_tree");
public static final ResourceKey<ConfiguredFeature<?, ?>> NETHER_WART_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":nether_wart_mushroom");
public static final ResourceKey<ConfiguredFeature<?, ?>> AURA_BLOOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_bloom");
public static final ResourceKey<ConfiguredFeature<?, ?>> AURA_CACTUS = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_cactus");
public static final ResourceKey<ConfiguredFeature<?, ?>> WARPED_AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":warped_aura_mushroom");
public static final ResourceKey<ConfiguredFeature<?, ?>> CRIMSON_AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":crimson_aura_mushroom");
public static final ResourceKey<ConfiguredFeature<?, ?>> AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_mushroom");
public static void bootstrap(BootstapContext<ConfiguredFeature<?, ?>> context) {
public static void bootstrap(BootstrapContext<ConfiguredFeature<?, ?>> context) {
FeatureUtils.register(context, ModFeatures.Configured.AURA_BLOOM, ModFeatures.AURA_BLOOM, NoneFeatureConfiguration.INSTANCE);
FeatureUtils.register(context, ModFeatures.Configured.AURA_CACTUS, ModFeatures.AURA_CACTUS, NoneFeatureConfiguration.INSTANCE);
FeatureUtils.register(context, ModFeatures.Configured.WARPED_AURA_MUSHROOM, ModFeatures.WARPED_AURA_MUSHROOM, NoneFeatureConfiguration.INSTANCE);
@ -45,25 +43,28 @@ public final class ModFeatures {
FeatureUtils.register(context, ModFeatures.Configured.NETHER_WART_MUSHROOM, ModFeatures.NETHER_WART_MUSHROOM, NoneFeatureConfiguration.INSTANCE);
}
}
public static final class Placed {
public static ResourceKey<PlacedFeature> AURA_BLOOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_bloom");
public static ResourceKey<PlacedFeature> AURA_CACTUS = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_cactus");
public static ResourceKey<PlacedFeature> WARPED_AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":warped_aura_mushroom");
public static ResourceKey<PlacedFeature> CRIMSON_AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":crimson_aura_mushroom");
public static ResourceKey<PlacedFeature> AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_mushroom");
public static final ResourceKey<PlacedFeature> AURA_BLOOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_bloom");
public static final ResourceKey<PlacedFeature> AURA_CACTUS = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_cactus");
public static final ResourceKey<PlacedFeature> WARPED_AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":warped_aura_mushroom");
public static final ResourceKey<PlacedFeature> CRIMSON_AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":crimson_aura_mushroom");
public static final ResourceKey<PlacedFeature> AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_mushroom");
public static void bootstrap(BootstapContext<PlacedFeature> context) {
HolderGetter<ConfiguredFeature<?, ?>> holdergetter = context.lookup(Registries.CONFIGURED_FEATURE);
public static void bootstrap(BootstrapContext<PlacedFeature> context) {
var holdergetter = context.lookup(Registries.CONFIGURED_FEATURE);
PlacementUtils.register(context, AURA_BLOOM, holdergetter.getOrThrow(ModFeatures.Configured.AURA_BLOOM));
PlacementUtils.register(context, AURA_CACTUS, holdergetter.getOrThrow(ModFeatures.Configured.AURA_CACTUS));
PlacementUtils.register(context, WARPED_AURA_MUSHROOM, holdergetter.getOrThrow(ModFeatures.Configured.WARPED_AURA_MUSHROOM));
PlacementUtils.register(context, CRIMSON_AURA_MUSHROOM, holdergetter.getOrThrow(ModFeatures.Configured.CRIMSON_AURA_MUSHROOM));
PlacementUtils.register(context, AURA_MUSHROOM, holdergetter.getOrThrow(ModFeatures.Configured.AURA_MUSHROOM));
PlacementUtils.register(context, Placed.AURA_BLOOM, holdergetter.getOrThrow(ModFeatures.Configured.AURA_BLOOM));
PlacementUtils.register(context, Placed.AURA_CACTUS, holdergetter.getOrThrow(ModFeatures.Configured.AURA_CACTUS));
PlacementUtils.register(context, Placed.WARPED_AURA_MUSHROOM, holdergetter.getOrThrow(ModFeatures.Configured.WARPED_AURA_MUSHROOM));
PlacementUtils.register(context, Placed.CRIMSON_AURA_MUSHROOM, holdergetter.getOrThrow(ModFeatures.Configured.CRIMSON_AURA_MUSHROOM));
PlacementUtils.register(context, Placed.AURA_MUSHROOM, holdergetter.getOrThrow(ModFeatures.Configured.AURA_MUSHROOM));
}
}
}

2
src/main/java/de/ellpeck/naturesaura/gui/GuiEnderCrate.java
View file

@ -11,7 +11,7 @@ import net.neoforged.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class GuiEnderCrate extends AbstractContainerScreen<ContainerEnderCrate> {
private static final ResourceLocation CHEST_GUI_TEXTURE = new ResourceLocation("textures/gui/container/generic_54.png");
private static final ResourceLocation CHEST_GUI_TEXTURE = ResourceLocation.withDefaultNamespace("textures/gui/container/generic_54.png");
public GuiEnderCrate(ContainerEnderCrate container, Inventory inv, Component title) {
super(container, inv, title);

3
src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java
View file

@ -10,6 +10,7 @@ import de.ellpeck.naturesaura.reg.ICustomCreativeTab;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.core.Holder;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.player.Player;
@ -40,7 +41,7 @@ public class ItemAuraCache extends ItemImpl implements ITrinketItem, ICustomCrea
if (recharge != null) {
if (recharge.rechargeFromContainer(container, itemSlot, i, player.getInventory().selected == i))
break;
} else if (stack.getEnchantmentLevel(ModEnchantments.AURA_MENDING) > 0) {
} else if (stack.getEnchantmentLevel(Holder.direct(ModEnchantments.AURA_MENDING)) > 0) {
var mainSize = player.getInventory().items.size();
var isArmor = i >= mainSize && i < mainSize + player.getInventory().armor.size();
if ((isArmor || player.getInventory().selected == i) && Helper.rechargeAuraItem(stack, container, 1000))

7
src/main/java/de/ellpeck/naturesaura/items/ItemCaveFinder.java
View file

@ -4,7 +4,6 @@ import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
@ -33,12 +32,13 @@ public class ItemCaveFinder extends ItemImpl {
for (var z = -range; z <= range; z++) {
var offset = pos.offset(x, y, z);
var state = levelIn.getBlockState(offset);
try {
// TODO figure out an entity-independent way of checking if a block is a valid spawn (just checking for air & ground below?)
/* try {
if (!state.getBlock().isValidSpawn(state, levelIn, offset, SpawnPlacements.Type.ON_GROUND, null))
continue;
} catch (Exception e) {
continue;
}
}*/
var offUp = offset.above();
var stateUp = levelIn.getBlockState(offUp);
@ -63,4 +63,5 @@ public class ItemCaveFinder extends ItemImpl {
playerIn.getCooldowns().addCooldown(this, 20 * 30);
return new InteractionResultHolder<>(InteractionResult.SUCCESS, stack);
}
}

36
src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java
View file

@ -4,7 +4,9 @@ import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.reg.IModItem;
import de.ellpeck.naturesaura.reg.ModArmorMaterial;
import de.ellpeck.naturesaura.reg.ModRegistry;
import net.minecraft.core.Holder;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.EquipmentSlot;
@ -18,24 +20,22 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.phys.AABB;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.common.NeoForgeMod;
import net.neoforged.neoforge.event.TickEvent;
import net.neoforged.neoforge.event.entity.living.LivingAttackEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent;
import net.neoforged.neoforge.event.tick.PlayerTickEvent;
import java.util.Comparator;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
public class ItemArmor extends ArmorItem implements IModItem {
private static final AttributeModifier SKY_MOVEMENT_MODIFIER = new AttributeModifier(UUID.fromString("c1f96acc-e117-4dc1-a351-e196a4de6071"), NaturesAura.MOD_ID + ":sky_movement_speed", 0.15F, AttributeModifier.Operation.MULTIPLY_TOTAL);
private static final AttributeModifier SKY_STEP_MODIFIER = new AttributeModifier(UUID.fromString("ac3ce414-7243-418c-97f8-ac84c2c102f6"), NaturesAura.MOD_ID + ":sky_step_modifier", 0.5F, AttributeModifier.Operation.ADDITION);
private static final AttributeModifier SKY_MOVEMENT_MODIFIER = new AttributeModifier(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "sky_movement_speed"), 0.15F, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL);
private static final AttributeModifier SKY_STEP_MODIFIER = new AttributeModifier(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "sky_step_modifier"), 0.5F, AttributeModifier.Operation.ADD_VALUE);
private static final Map<ArmorMaterial, Item[]> SETS = new ConcurrentHashMap<>();
private final String baseName;
public ItemArmor(String baseName, ArmorMaterial materialIn, ArmorItem.Type equipmentSlotIn) {
public ItemArmor(String baseName, Holder<ArmorMaterial> materialIn, ArmorItem.Type equipmentSlotIn) {
super(materialIn, equipmentSlotIn, new Properties());
this.baseName = baseName;
ModRegistry.ALL_ITEMS.add(this);
@ -43,7 +43,7 @@ public class ItemArmor extends ArmorItem implements IModItem {
public static boolean isFullSetEquipped(LivingEntity entity, ArmorMaterial material) {
var set = ItemArmor.SETS.computeIfAbsent(material, m -> BuiltInRegistries.ITEM.stream()
.filter(i -> i instanceof ItemArmor && ((ItemArmor) i).getMaterial() == material)
.filter(i -> i instanceof ItemArmor && ((ItemArmor) i).getMaterial().value() == material)
.sorted(Comparator.comparingInt(i -> ((ItemArmor) i).getEquipmentSlot().ordinal()))
.toArray(Item[]::new));
for (var i = 0; i < 4; i++) {
@ -60,11 +60,11 @@ public class ItemArmor extends ArmorItem implements IModItem {
return this.baseName;
}
@Mod.EventBusSubscriber
@EventBusSubscriber
private static final class EventHandler {
@SubscribeEvent
public static void onAttack(LivingAttackEvent event) {
public static void onAttack(LivingIncomingDamageEvent event) {
var entity = event.getEntity();
if (!entity.level().isClientSide) {
if (ItemArmor.isFullSetEquipped(entity, ModArmorMaterial.INFUSED)) {
@ -81,25 +81,25 @@ public class ItemArmor extends ArmorItem implements IModItem {
}
@SubscribeEvent
public static void update(TickEvent.PlayerTickEvent event) {
var player = event.player;
public static void update(PlayerTickEvent event) {
var player = event.getEntity();
var speed = player.getAttribute(Attributes.MOVEMENT_SPEED);
var step = player.getAttribute(NeoForgeMod.STEP_HEIGHT.value());
var step = player.getAttribute(Attributes.STEP_HEIGHT);
var key = NaturesAura.MOD_ID + ":sky_equipped";
var nbt = player.getPersistentData();
var equipped = ItemArmor.isFullSetEquipped(player, ModArmorMaterial.SKY);
if (equipped && !nbt.getBoolean(key)) {
// we just equipped it
nbt.putBoolean(key, true);
if (!step.hasModifier(ItemArmor.SKY_STEP_MODIFIER))
if (!step.hasModifier(ItemArmor.SKY_STEP_MODIFIER.id()))
step.addPermanentModifier(ItemArmor.SKY_STEP_MODIFIER);
if (!speed.hasModifier(ItemArmor.SKY_MOVEMENT_MODIFIER))
if (!speed.hasModifier(ItemArmor.SKY_MOVEMENT_MODIFIER.id()))
speed.addPermanentModifier(ItemArmor.SKY_MOVEMENT_MODIFIER);
} else if (!equipped && nbt.getBoolean(key)) {
// we just unequipped it
nbt.putBoolean(key, false);
step.removeModifier(ItemArmor.SKY_STEP_MODIFIER.getId());
speed.removeModifier(ItemArmor.SKY_MOVEMENT_MODIFIER.getId());
step.removeModifier(ItemArmor.SKY_STEP_MODIFIER.id());
speed.removeModifier(ItemArmor.SKY_MOVEMENT_MODIFIER.id());
}
}

16
src/main/java/de/ellpeck/naturesaura/items/tools/ItemAxe.java
View file

@ -10,6 +10,7 @@ import net.minecraft.core.BlockPos;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.AxeItem;
import net.minecraft.world.item.ItemStack;
@ -20,10 +21,12 @@ import net.minecraft.world.level.block.state.BlockState;
public class ItemAxe extends AxeItem implements IModItem, ICustomItemModel {
private final String baseName;
private final float defaultSpeed;
public ItemAxe(String baseName, Tier material, float damage, float speed) {
super(material, damage, speed, new Properties());
super(material, new Properties().attributes(AxeItem.createAttributes(material, damage, speed)));
this.baseName = baseName;
this.defaultSpeed = speed;
ModRegistry.ALL_ITEMS.add(this);
}
@ -35,20 +38,19 @@ public class ItemAxe extends AxeItem implements IModItem, ICustomItemModel {
@Override
public float getDestroySpeed(ItemStack stack, BlockState state) {
if (state.is(BlockTags.LEAVES)) {
return this.speed;
return this.defaultSpeed;
} else {
return super.getDestroySpeed(stack, state);
}
}
@Override
public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, Player player) {
if ((stack.getItem() == ModItems.SKY_AXE || stack.getItem() == ModItems.DEPTH_AXE) && Helper.isToolEnabled(stack) && player.level().getBlockState(pos).is(BlockTags.LOGS)) {
public boolean mineBlock(ItemStack stack, Level level, BlockState state, BlockPos pos, LivingEntity miningEntity) {
if ((stack.getItem() == ModItems.SKY_AXE || stack.getItem() == ModItems.DEPTH_AXE) && Helper.isToolEnabled(stack) && level.getBlockState(pos).is(BlockTags.LOGS)) {
var horRange = stack.getItem() == ModItems.DEPTH_AXE ? 6 : 1;
Helper.mineRecursively(player.level(), pos, pos, stack, horRange, 32, s -> s.is(BlockTags.LOGS));
return true;
Helper.mineRecursively(level, pos, pos, stack, horRange, 32, s -> s.is(BlockTags.LOGS));
}
return false;
return super.mineBlock(stack, level, state, pos, miningEntity);
}
@Override

28
src/main/java/de/ellpeck/naturesaura/items/tools/ItemHoe.java
View file

@ -7,17 +7,19 @@ import de.ellpeck.naturesaura.reg.IModItem;
import de.ellpeck.naturesaura.reg.ModRegistry;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.HoeItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.Tier;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.BushBlock;
import net.minecraft.world.level.block.LeavesBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.BlockHitResult;
public class ItemHoe extends HoeItem implements IModItem, ICustomItemModel {
@ -25,7 +27,7 @@ public class ItemHoe extends HoeItem implements IModItem, ICustomItemModel {
private final String baseName;
public ItemHoe(String baseName, Tier material, int speed) {
super(material, speed, 0, new Properties());
super(material, new Properties().attributes(HoeItem.createAttributes(material, 0, speed)));
this.baseName = baseName;
ModRegistry.ALL_ITEMS.add(this);
}
@ -74,12 +76,11 @@ public class ItemHoe extends HoeItem implements IModItem, ICustomItemModel {
}
@Override
public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, Player player) {
if (!player.isShiftKeyDown() && (stack.getItem() == ModItems.SKY_HOE || stack.getItem() == ModItems.DEPTH_HOE)) {
var block = player.level().getBlockState(pos).getBlock();
if (!(block instanceof BushBlock) && (stack.getItem() != ModItems.DEPTH_HOE || !(block instanceof LeavesBlock)))
return false;
if (!player.level().isClientSide) {
public boolean mineBlock(ItemStack stack, Level level, BlockState state, BlockPos pos, LivingEntity miningEntity) {
if (!miningEntity.isShiftKeyDown() && (stack.getItem() == ModItems.SKY_HOE || stack.getItem() == ModItems.DEPTH_HOE)) {
var block = level.getBlockState(pos).getBlock();
if (block instanceof BushBlock || stack.getItem() == ModItems.DEPTH_HOE && block instanceof LeavesBlock) {
if (!level.isClientSide) {
var range = 3;
for (var x = -range; x <= range; x++) {
for (var y = -range; y <= range; y++) {
@ -87,18 +88,19 @@ public class ItemHoe extends HoeItem implements IModItem, ICustomItemModel {
if (x == 0 && y == 0 && z == 0)
continue;
var offset = pos.offset(x, y, z);
var offState = player.level().getBlockState(offset);
var offState = level.getBlockState(offset);
if (offState.getBlock() instanceof BushBlock || stack.getItem() == ModItems.DEPTH_HOE && offState.getBlock() instanceof LeavesBlock) {
var entity = offState.hasBlockEntity() ? player.level().getBlockEntity(offset) : null;
Block.dropResources(offState, player.level(), offset, entity, null, stack);
player.level().setBlock(offset, Blocks.AIR.defaultBlockState(), 3);
var entity = offState.hasBlockEntity() ? level.getBlockEntity(offset) : null;
Block.dropResources(offState, level, offset, entity, null, stack);
level.setBlock(offset, Blocks.AIR.defaultBlockState(), 3);
}
}
}
}
}
}
return false;
}
return super.mineBlock(stack, level, state, pos, miningEntity);
}
@Override

17
src/main/java/de/ellpeck/naturesaura/items/tools/ItemPickaxe.java
View file

@ -16,6 +16,7 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
@ -23,6 +24,7 @@ import net.minecraft.world.item.PickaxeItem;
import net.minecraft.world.item.Tier;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.AABB;
import net.neoforged.neoforge.common.Tags;
@ -31,7 +33,7 @@ public class ItemPickaxe extends PickaxeItem implements IModItem, ICustomItemMod
private final String baseName;
public ItemPickaxe(String baseName, Tier material, int damage, float speed) {
super(material, damage, speed, new Properties());
super(material, new Properties().attributes(PickaxeItem.createAttributes(material, damage, speed)));
this.baseName = baseName;
ModRegistry.ALL_ITEMS.add(this);
}
@ -58,7 +60,7 @@ public class ItemPickaxe extends PickaxeItem implements IModItem, ICustomItemMod
data.addMossStone(pos);
}
level.playSound(player, pos, SoundEvents.STONE_PLACE, SoundSource.BLOCKS, 1.0F, 1.0F);
stack.hurtAndBreak(15, player, p -> p.broadcastBreakEvent(context.getHand()));
stack.hurtAndBreak(15, player, LivingEntity.getSlotForHand(context.getHand()));
return InteractionResult.SUCCESS;
}
}
@ -84,12 +86,11 @@ public class ItemPickaxe extends PickaxeItem implements IModItem, ICustomItemMod
}
@Override
public boolean onBlockStartBreak(ItemStack itemstack, BlockPos pos, Player player) {
if (itemstack.getItem() == ModItems.DEPTH_PICKAXE && Helper.isToolEnabled(itemstack) && player.level().getBlockState(pos).is(Tags.Blocks.ORES)) {
Helper.mineRecursively(player.level(), pos, pos, itemstack, 5, 5, s -> s.is(Tags.Blocks.ORES));
return true;
}
return false;
public boolean mineBlock(ItemStack stack, Level level, BlockState state, BlockPos pos, LivingEntity miningEntity) {
// TODO test depth pickaxe vein mining
if (stack.getItem() == ModItems.DEPTH_PICKAXE && Helper.isToolEnabled(stack) && level.getBlockState(pos).is(Tags.Blocks.ORES))
Helper.mineRecursively(level, pos, pos, stack, 5, 5, s -> s.is(Tags.Blocks.ORES));
return super.mineBlock(stack, level, state, pos, miningEntity);
}
@Override

9
src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovel.java
View file

@ -12,6 +12,7 @@ import net.minecraft.sounds.SoundSource;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.ShovelItem;
import net.minecraft.world.item.Tier;
@ -27,7 +28,7 @@ public class ItemShovel extends ShovelItem implements IModItem, ICustomItemModel
private final String baseName;
public ItemShovel(String baseName, Tier material, float damage, float speed) {
super(material, damage, speed, new Properties());
super(material, new Properties().attributes(ShovelItem.createAttributes(material, damage, speed)));
this.baseName = baseName;
ModRegistry.ALL_ITEMS.add(this);
}
@ -65,7 +66,7 @@ public class ItemShovel extends ShovelItem implements IModItem, ICustomItemModel
}
level.playSound(player, pos, SoundEvents.GRASS_PLACE, SoundSource.BLOCKS, 1.0F, 1.0F);
stack.hurtAndBreak(Mth.ceil(damage), player, p -> p.broadcastBreakEvent(context.getHand()));
stack.hurtAndBreak(Mth.ceil(damage), player, LivingEntity.getSlotForHand(context.getHand()));
return InteractionResult.SUCCESS;
}
}
@ -91,7 +92,7 @@ public class ItemShovel extends ShovelItem implements IModItem, ICustomItemModel
}
if (flattened) {
level.playSound(player, pos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F);
stack.hurtAndBreak(1, player, p -> p.broadcastBreakEvent(context.getHand()));
stack.hurtAndBreak(1, player, LivingEntity.getSlotForHand(context.getHand()));
return InteractionResult.SUCCESS;
}
}
@ -109,7 +110,7 @@ public class ItemShovel extends ShovelItem implements IModItem, ICustomItemModel
Block.dropResources(state, level, pos, tile, null, stack);
var newContext = new UseOnContext(player, otherHand, new BlockHitResult(context.getClickLocation(), context.getClickedFace(), context.getClickedPos(), context.isInside()));
other.useOn(newContext);
stack.hurtAndBreak(1, player, p -> p.broadcastBreakEvent(context.getHand()));
stack.hurtAndBreak(1, player, LivingEntity.getSlotForHand(context.getHand()));
return InteractionResult.SUCCESS;
}

2
src/main/java/de/ellpeck/naturesaura/items/tools/ItemSword.java
View file

@ -24,7 +24,7 @@ public class ItemSword extends SwordItem implements IModItem, ICustomItemModel {
private final String baseName;
public ItemSword(String baseName, Tier material, int damage, float speed) {
super(material, damage, speed, new Properties());
super(material, new Properties().attributes(SwordItem.createAttributes(material, damage, speed)));
this.baseName = baseName;
ModRegistry.ALL_ITEMS.add(this);
}

2
src/main/java/de/ellpeck/naturesaura/misc/ColoredBlockHelper.java
View file

@ -23,7 +23,7 @@ public final class ColoredBlockHelper {
private static List<Block> collectBlocks(String name) {
return Arrays.stream(DyeColor.values()).sorted(Comparator.comparingInt(DyeColor::getId)).map(c -> {
var loc = new ResourceLocation(c.getName() + '_' + name);
var loc = ResourceLocation.parse(c.getName() + '_' + name);
var block = BuiltInRegistries.BLOCK.get(loc);
if (block == null || block == Blocks.AIR)
throw new IllegalStateException("Couldn't find block with name " + loc);

11
src/main/java/de/ellpeck/naturesaura/misc/LevelData.java
View file

@ -10,6 +10,7 @@ import de.ellpeck.naturesaura.chunk.AuraChunk;
import de.ellpeck.naturesaura.items.ModItems;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.LongTag;
@ -39,24 +40,24 @@ public class LevelData extends SavedData implements ILevelData {
}
public LevelData(CompoundTag compound) {
public LevelData(CompoundTag compound, HolderLookup.Provider registries) {
for (var base : compound.getList("storages", 10)) {
var storageComp = (CompoundTag) base;
var storage = this.getEnderStorage(storageComp.getString("name"));
storage.deserializeNBT(storageComp);
storage.deserializeNBT(registries, storageComp);
}
for (var base : compound.getList("converted_moss", Tag.TAG_LONG))
this.recentlyConvertedMossStones.add(BlockPos.of(((LongTag) base).getAsLong()));
}
@Override
public CompoundTag save(CompoundTag compound) {
public CompoundTag save(CompoundTag compound, HolderLookup.Provider registries) {
var storages = new ListTag();
for (var entry : this.enderStorages.entrySet()) {
var handler = entry.getValue();
if (Helper.isEmpty(handler))
continue;
var storageComp = handler.serializeNBT();
var storageComp = handler.serializeNBT(registries);
storageComp.putString("name", entry.getKey());
storages.add(storageComp);
}
@ -94,7 +95,7 @@ public class LevelData extends SavedData implements ILevelData {
public void addMossStone(BlockPos pos) {
this.recentlyConvertedMossStones.add(pos);
if (this.recentlyConvertedMossStones.size() > 512)
this.recentlyConvertedMossStones.remove(0);
this.recentlyConvertedMossStones.removeFirst();
}
}

20
src/main/java/de/ellpeck/naturesaura/particles/ParticleHandler.java
View file

@ -16,6 +16,7 @@ import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.texture.TextureManager;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import org.jetbrains.annotations.Nullable;
import java.util.Locale;
import java.util.function.Supplier;
@ -26,15 +27,10 @@ public final class ParticleHandler {
public static final ParticleRenderType MAGIC = new ParticleRenderType() {
@Override
public void begin(BufferBuilder buffer, TextureManager textureManager) {
public @Nullable BufferBuilder begin(Tesselator tesselator, TextureManager textureManager) {
ParticleHandler.setupRendering();
RenderSystem.enableDepthTest();
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE);
}
@Override
public void end(Tesselator tessellator) {
tessellator.end();
return tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE);
}
@Override
@ -45,15 +41,10 @@ public final class ParticleHandler {
public static final ParticleRenderType MAGIC_NO_DEPTH = new ParticleRenderType() {
@Override
public void begin(BufferBuilder buffer, TextureManager textureManager) {
public @Nullable BufferBuilder begin(Tesselator tesselator, TextureManager textureManager) {
ParticleHandler.setupRendering();
RenderSystem.disableDepthTest();
buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE);
}
@Override
public void end(Tesselator tessellator) {
tessellator.end();
return tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE);
}
@Override
@ -94,4 +85,5 @@ public final class ParticleHandler {
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.setShaderTexture(0, ParticleMagic.TEXTURE);
}
}

11
src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java
View file

@ -19,7 +19,7 @@ import java.util.Collections;
@OnlyIn(Dist.CLIENT)
public class ParticleMagic extends Particle {
public static final ResourceLocation TEXTURE = new ResourceLocation(NaturesAura.MOD_ID, "textures/particles/magic_round.png");
public static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "textures/particles/magic_round.png");
private final float desiredScale;
private final boolean fade;
@ -109,10 +109,10 @@ public class ParticleMagic extends Particle {
}
var j = this.getLightColor(partialTicks);
buffer.vertex(avector3f[0].x(), avector3f[0].y(), avector3f[0].z()).uv(0, 1).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(j).endVertex();
buffer.vertex(avector3f[1].x(), avector3f[1].y(), avector3f[1].z()).uv(1, 1).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(j).endVertex();
buffer.vertex(avector3f[2].x(), avector3f[2].y(), avector3f[2].z()).uv(1, 0).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(j).endVertex();
buffer.vertex(avector3f[3].x(), avector3f[3].y(), avector3f[3].z()).uv(0, 0).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(j).endVertex();
buffer.addVertex(avector3f[0].x(), avector3f[0].y(), avector3f[0].z()).setUv(0, 1).setColor(this.rCol, this.gCol, this.bCol, this.alpha).setLight(j);
buffer.addVertex(avector3f[1].x(), avector3f[1].y(), avector3f[1].z()).setUv(1, 1).setColor(this.rCol, this.gCol, this.bCol, this.alpha).setLight(j);
buffer.addVertex(avector3f[2].x(), avector3f[2].y(), avector3f[2].z()).setUv(1, 0).setColor(this.rCol, this.gCol, this.bCol, this.alpha).setLight(j);
buffer.addVertex(avector3f[3].x(), avector3f[3].y(), avector3f[3].z()).setUv(0, 0).setColor(this.rCol, this.gCol, this.bCol, this.alpha).setLight(j);
}
@Override
@ -124,4 +124,5 @@ public class ParticleMagic extends Particle {
protected int getLightColor(float p_107249_) {
return 15 << 20 | 15 << 4;
}
}

6
src/main/java/de/ellpeck/naturesaura/potion/PotionBreathless.java
View file

@ -1,5 +1,6 @@
package de.ellpeck.naturesaura.potion;
import net.minecraft.core.Holder;
import net.minecraft.world.effect.MobEffectCategory;
import net.minecraft.world.entity.LivingEntity;
import net.neoforged.neoforge.common.NeoForge;
@ -19,7 +20,7 @@ public class PotionBreathless extends PotionImpl {
@SubscribeEvent
public void onHeal(LivingHealEvent event) {
var effect = event.getEntity().getEffect(this);
var effect = event.getEntity().getEffect(Holder.direct(this));
if (effect == null)
return;
var chance = (effect.getAmplifier() + 1) / 15F;
@ -35,8 +36,9 @@ public class PotionBreathless extends PotionImpl {
}
@Override
public void applyEffectTick(LivingEntity entity, int amplifier) {
public boolean applyEffectTick(LivingEntity entity, int amplifier) {
entity.hurt(entity.damageSources().magic(), 1F);
return true;
}
}

23
src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java
View file

@ -22,7 +22,6 @@ import de.ellpeck.naturesaura.reg.ModRegistry;
import de.ellpeck.naturesaura.renderers.PlayerLayerTrinkets;
import de.ellpeck.naturesaura.renderers.SupporterFancyHandler;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.MenuScreens;
import net.minecraft.client.renderer.ItemBlockRenderTypes;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.entity.EntityRenderer;
@ -30,27 +29,35 @@ import net.minecraft.client.renderer.entity.EntityRenderers;
import net.minecraft.client.renderer.entity.ThrownItemRenderer;
import net.minecraft.client.renderer.entity.player.PlayerRenderer;
import net.minecraft.client.renderer.item.ItemProperties;
import net.minecraft.client.resources.PlayerSkin;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
import net.neoforged.neoforge.common.NeoForge;
public class ClientProxy implements IProxy {
// TODO check ender crate registry functions
@SubscribeEvent
public void registerMenuScreens(RegisterMenuScreensEvent event) {
event.register(ModContainers.ENDER_CRATE, GuiEnderCrate::new);
event.register(ModContainers.ENDER_ACCESS, GuiEnderCrate::new);
}
@Override
public void preInit(FMLCommonSetupEvent event) {
NeoForge.EVENT_BUS.register(new ClientEvents());
Compat.setupClient();
MenuScreens.register(ModContainers.ENDER_CRATE, GuiEnderCrate::new);
MenuScreens.register(ModContainers.ENDER_ACCESS, GuiEnderCrate::new);
ItemProperties.register(ModItems.COLOR_CHANGER, new ResourceLocation(NaturesAura.MOD_ID, "fill_mode"),
ItemProperties.register(ModItems.COLOR_CHANGER, ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "fill_mode"),
(stack, level, entity, i) -> ItemColorChanger.isFillMode(stack) ? 1 : 0);
ItemProperties.register(ModItems.COLOR_CHANGER, new ResourceLocation(NaturesAura.MOD_ID, "has_color"),
ItemProperties.register(ModItems.COLOR_CHANGER, ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "has_color"),
(stack, level, entity, i) -> ItemColorChanger.getStoredColor(stack) != null ? 1 : 0);
for (var item : new Item[]{ModItems.SKY_AXE, ModItems.DEPTH_PICKAXE, ModItems.DEPTH_AXE}) {
ItemProperties.register(item, new ResourceLocation(NaturesAura.MOD_ID, "enabled"),
ItemProperties.register(item, ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "enabled"),
(stack, level, entity, i) -> Helper.isToolEnabled(stack) ? 1 : 0);
}
}
@ -58,7 +65,7 @@ public class ClientProxy implements IProxy {
@Override
public void init(FMLCommonSetupEvent event) {
var skinMap = Minecraft.getInstance().getEntityRenderDispatcher().getSkinMap();
for (var render : new EntityRenderer[]{skinMap.get("default"), skinMap.get("slim")}) {
for (var render : new EntityRenderer[]{skinMap.get(PlayerSkin.Model.WIDE), skinMap.get(PlayerSkin.Model.SLIM)}) {
if (render instanceof PlayerRenderer living)
living.addLayer(new PlayerLayerTrinkets(living));
}

32
src/main/java/de/ellpeck/naturesaura/recipes/AltarRecipe.java
View file

@ -1,16 +1,17 @@
package de.ellpeck.naturesaura.recipes;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.core.RegistryAccess;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.core.HolderLookup;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.ByteBufCodecs;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.item.crafting.RecipeType;
import javax.annotation.Nullable;
public class AltarRecipe extends ModRecipe {
public final Ingredient input;
@ -28,7 +29,7 @@ public class AltarRecipe extends ModRecipe {
}
@Override
public ItemStack getResultItem(RegistryAccess access) {
public ItemStack getResultItem(HolderLookup.Provider registries) {
return this.output;
}
@ -44,32 +45,23 @@ public class AltarRecipe extends ModRecipe {
public static class Serializer implements RecipeSerializer<AltarRecipe> {
private static final Codec<AltarRecipe> CODEC = RecordCodecBuilder.create(i -> i.group(
private static final MapCodec<AltarRecipe> CODEC = RecordCodecBuilder.mapCodec(i -> i.group(
Ingredient.CODEC.fieldOf("input").forGetter(r -> r.input),
ItemStack.ITEM_WITH_COUNT_CODEC.fieldOf("output").forGetter(r -> r.output),
ItemStack.CODEC.fieldOf("output").forGetter(r -> r.output),
Ingredient.CODEC.optionalFieldOf("catalyst", Ingredient.EMPTY).forGetter(r -> r.catalyst),
Codec.INT.fieldOf("aura").forGetter(r -> r.aura),
Codec.INT.fieldOf("time").forGetter(r -> r.time)
).apply(i, AltarRecipe::new));
private static final StreamCodec<RegistryFriendlyByteBuf, AltarRecipe> STREAM_CODEC = ByteBufCodecs.fromCodecWithRegistries(Serializer.CODEC.codec());
@Override
public Codec<AltarRecipe> codec() {
public MapCodec<AltarRecipe> codec() {
return Serializer.CODEC;
}
@Nullable
@Override
public AltarRecipe fromNetwork(FriendlyByteBuf buffer) {
return new AltarRecipe(Ingredient.fromNetwork(buffer), buffer.readItem(), Ingredient.fromNetwork(buffer), buffer.readInt(), buffer.readInt());
}
@Override
public void toNetwork(FriendlyByteBuf buffer, AltarRecipe recipe) {
recipe.input.toNetwork(buffer);
buffer.writeItem(recipe.output);
recipe.catalyst.toNetwork(buffer);
buffer.writeInt(recipe.aura);
buffer.writeInt(recipe.time);
public StreamCodec<RegistryFriendlyByteBuf, AltarRecipe> streamCodec() {
return Serializer.STREAM_CODEC;
}
}

34
src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java
View file

@ -1,11 +1,14 @@
package de.ellpeck.naturesaura.recipes;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.core.BlockPos;
import net.minecraft.core.RegistryAccess;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.ByteBufCodecs;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
@ -17,7 +20,6 @@ import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.item.crafting.RecipeType;
import net.minecraft.world.level.Level;
import java.util.ArrayList;
import java.util.List;
public class AnimalSpawnerRecipe extends ModRecipe {
@ -38,11 +40,11 @@ public class AnimalSpawnerRecipe extends ModRecipe {
// passed position is zero on the client, so we don't want to do initialization stuff for the entity
if (pos == BlockPos.ZERO)
return this.entity.create(level);
return this.entity.create((ServerLevel) level, null, null, pos, MobSpawnType.SPAWNER, false, false);
return this.entity.create((ServerLevel) level, null, pos, MobSpawnType.SPAWNER, false, false);
}
@Override
public ItemStack getResultItem(RegistryAccess access) {
public ItemStack getResultItem(HolderLookup.Provider registries) {
return ItemStack.EMPTY;
}
@ -58,34 +60,22 @@ public class AnimalSpawnerRecipe extends ModRecipe {
public static class Serializer implements RecipeSerializer<AnimalSpawnerRecipe> {
private static final Codec<AnimalSpawnerRecipe> CODEC = RecordCodecBuilder.create(i -> i.group(
private static final MapCodec<AnimalSpawnerRecipe> CODEC = RecordCodecBuilder.mapCodec(i -> i.group(
ResourceLocation.CODEC.fieldOf("entity").forGetter(r -> BuiltInRegistries.ENTITY_TYPE.getKey(r.entity)),
Codec.INT.fieldOf("aura").forGetter(r -> r.aura),
Codec.INT.fieldOf("time").forGetter(r -> r.time),
Ingredient.CODEC.listOf().fieldOf("ingredients").forGetter(r -> r.ingredients)
).apply(i, AnimalSpawnerRecipe::new));
private static final StreamCodec<RegistryFriendlyByteBuf, AnimalSpawnerRecipe> STREAM_CODEC = ByteBufCodecs.fromCodecWithRegistries(AnimalSpawnerRecipe.Serializer.CODEC.codec());
@Override
public Codec<AnimalSpawnerRecipe> codec() {
public MapCodec<AnimalSpawnerRecipe> codec() {
return Serializer.CODEC;
}
@Override
public AnimalSpawnerRecipe fromNetwork(FriendlyByteBuf buffer) {
var ingredients = new ArrayList<Ingredient>();
for (var i = buffer.readInt(); i > 0; i--)
ingredients.add(Ingredient.fromNetwork(buffer));
return new AnimalSpawnerRecipe(buffer.readResourceLocation(), buffer.readInt(), buffer.readInt(), ingredients);
}
@Override
public void toNetwork(FriendlyByteBuf buffer, AnimalSpawnerRecipe recipe) {
buffer.writeInt(recipe.ingredients.size());
for (var ing : recipe.ingredients)
ing.toNetwork(buffer);
buffer.writeResourceLocation(BuiltInRegistries.ENTITY_TYPE.getKey(recipe.entity));
buffer.writeInt(recipe.aura);
buffer.writeInt(recipe.time);
public StreamCodec<RegistryFriendlyByteBuf, AnimalSpawnerRecipe> streamCodec() {
return Serializer.STREAM_CODEC;
}
}

5
src/main/java/de/ellpeck/naturesaura/recipes/EnabledCondition.java
View file

@ -1,6 +1,7 @@
package de.ellpeck.naturesaura.recipes;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import de.ellpeck.naturesaura.ModConfig;
import de.ellpeck.naturesaura.NaturesAura;
@ -9,7 +10,7 @@ import net.neoforged.neoforge.common.conditions.ICondition;
public class EnabledCondition implements ICondition {
private static final Codec<EnabledCondition> CODEC = RecordCodecBuilder.create(i ->
private static final MapCodec<EnabledCondition> CODEC = RecordCodecBuilder.mapCodec(i ->
i.group(Codec.STRING.fieldOf("name").forGetter(c -> c.name)).apply(i, EnabledCondition::new)
);
@ -32,7 +33,7 @@ public class EnabledCondition implements ICondition {
}
@Override
public Codec<? extends ICondition> codec() {
public MapCodec<? extends ICondition> codec() {
return EnabledCondition.CODEC;
}

5
src/main/java/de/ellpeck/naturesaura/recipes/ModRecipe.java
View file

@ -1,6 +1,6 @@
package de.ellpeck.naturesaura.recipes;
import net.minecraft.core.RegistryAccess;
import net.minecraft.core.HolderLookup;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.level.Level;
@ -15,7 +15,7 @@ public abstract class ModRecipe implements Recipe<RecipeWrapper> {
}
@Override
public ItemStack assemble(RecipeWrapper inv, RegistryAccess access) {
public ItemStack assemble(RecipeWrapper input, HolderLookup.Provider registries) {
return ItemStack.EMPTY;
}
@ -24,5 +24,4 @@ public abstract class ModRecipe implements Recipe<RecipeWrapper> {
return false;
}
}

Some files were not shown because too many files have changed in this diff Show more