mirror of
https://github.com/Ellpeck/NaturesAura.git
synced 2024-11-26 13:18:34 +01:00
Compare commits
5 commits
ff264f5539
...
9c83d62055
| Author | SHA1 | Date | |
|---|---|---|---|
| 9c83d62055 | |||
| a88458d6d0 | |||
| 570379fd36 | |||
| 36b5114da3 | |||
| 9294a90e1a |
119 changed files with 312 additions and 551 deletions
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "naturesaura:block/conversion_catalyst"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "naturesaura:block/crushing_catalyst"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "naturesaura:block/nature_altar"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "naturesaura:block/conversion_catalyst_nether"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "naturesaura:block/crushing_catalyst_nether"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"values": [
|
||||
"naturesaura:ancient_stairs",
|
||||
"naturesaura:offering_table",
|
||||
"naturesaura:wood_stand",
|
||||
"naturesaura:auto_crafter",
|
||||
"naturesaura:ancient_bark",
|
||||
"naturesaura:oak_generator",
|
||||
"naturesaura:ancient_slab",
|
||||
"naturesaura:flower_generator",
|
||||
"naturesaura:ancient_log",
|
||||
"naturesaura:offering_table",
|
||||
"naturesaura:ancient_planks",
|
||||
"naturesaura:ancient_stairs",
|
||||
"naturesaura:oak_generator",
|
||||
"naturesaura:wood_stand",
|
||||
"naturesaura:ancient_bark",
|
||||
"naturesaura:ancient_slab",
|
||||
"naturesaura:nether_wart_mushroom",
|
||||
"naturesaura:flower_generator"
|
||||
"naturesaura:auto_crafter"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,46 +1,46 @@
|
|||
{
|
||||
"values": [
|
||||
"naturesaura:pickup_stopper",
|
||||
"naturesaura:rf_converter",
|
||||
"naturesaura:infused_slab",
|
||||
"naturesaura:aura_detector",
|
||||
"naturesaura:infused_stairs",
|
||||
"naturesaura:infused_iron_block",
|
||||
"naturesaura:item_distributor",
|
||||
"naturesaura:placer",
|
||||
"naturesaura:infused_stone",
|
||||
"naturesaura:gold_brick",
|
||||
"naturesaura:generator_limit_remover",
|
||||
"naturesaura:crushing_catalyst",
|
||||
"naturesaura:chunk_loader",
|
||||
"naturesaura:projectile_generator",
|
||||
"naturesaura:furnace_heater",
|
||||
"naturesaura:powder_placer",
|
||||
"naturesaura:animal_generator",
|
||||
"naturesaura:animal_container",
|
||||
"naturesaura:weather_changer",
|
||||
"naturesaura:firework_generator",
|
||||
"naturesaura:aura_timer",
|
||||
"naturesaura:hopper_upgrade",
|
||||
"naturesaura:spring",
|
||||
"naturesaura:blast_furnace_booster",
|
||||
"naturesaura:infused_brick_stairs",
|
||||
"naturesaura:chorus_generator",
|
||||
"naturesaura:time_changer",
|
||||
"naturesaura:moss_generator",
|
||||
"naturesaura:conversion_catalyst",
|
||||
"naturesaura:snow_creator",
|
||||
"naturesaura:ender_crate",
|
||||
"naturesaura:gold_nether_brick",
|
||||
"naturesaura:nature_altar",
|
||||
"naturesaura:aura_detector",
|
||||
"naturesaura:infused_slab",
|
||||
"naturesaura:tainted_gold_block",
|
||||
"naturesaura:spawn_lamp",
|
||||
"naturesaura:nether_grass",
|
||||
"naturesaura:field_creator",
|
||||
"naturesaura:grated_chute",
|
||||
"naturesaura:snow_creator",
|
||||
"naturesaura:infused_brick",
|
||||
"naturesaura:weather_changer",
|
||||
"naturesaura:infused_brick_slab",
|
||||
"naturesaura:field_creator",
|
||||
"naturesaura:infused_stone",
|
||||
"naturesaura:time_changer",
|
||||
"naturesaura:nature_altar",
|
||||
"naturesaura:placer",
|
||||
"naturesaura:firework_generator",
|
||||
"naturesaura:infused_stairs",
|
||||
"naturesaura:projectile_generator",
|
||||
"naturesaura:item_distributor",
|
||||
"naturesaura:chunk_loader",
|
||||
"naturesaura:rf_converter",
|
||||
"naturesaura:spawn_lamp",
|
||||
"naturesaura:blast_furnace_booster",
|
||||
"naturesaura:nether_grass",
|
||||
"naturesaura:animal_container",
|
||||
"naturesaura:moss_generator",
|
||||
"naturesaura:generator_limit_remover",
|
||||
"naturesaura:pickup_stopper",
|
||||
"naturesaura:aura_timer",
|
||||
"naturesaura:animal_spawner",
|
||||
"naturesaura:ender_crate",
|
||||
"naturesaura:animal_generator",
|
||||
"naturesaura:chorus_generator",
|
||||
"naturesaura:hopper_upgrade",
|
||||
"naturesaura:furnace_heater",
|
||||
"naturesaura:potion_generator",
|
||||
"naturesaura:animal_spawner"
|
||||
"naturesaura:infused_brick_stairs",
|
||||
"naturesaura:infused_iron_block",
|
||||
"naturesaura:powder_placer",
|
||||
"naturesaura:crushing_catalyst",
|
||||
"naturesaura:conversion_catalyst",
|
||||
"naturesaura:gold_nether_brick",
|
||||
"naturesaura:gold_brick"
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"values": [
|
||||
"minecraft:red_nether_bricks",
|
||||
"minecraft:chiseled_stone_bricks"
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"values": [
|
||||
"naturesaura:gold_brick",
|
||||
"naturesaura:gold_nether_brick"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"values": [
|
||||
"#minecraft:stone_bricks"
|
||||
"#minecraft:stone_bricks",
|
||||
"minecraft:nether_bricks"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
{
|
||||
"values": [
|
||||
"#minecraft:planks"
|
||||
"#minecraft:planks",
|
||||
"minecraft:crimson_planks",
|
||||
"minecraft:warped_planks"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"values": [
|
||||
"minecraft:nether_bricks"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"values": [
|
||||
"minecraft:crimson_planks",
|
||||
"minecraft:warped_planks"
|
||||
]
|
||||
}
|
||||
|
|
@ -44,8 +44,8 @@ import net.minecraftforge.common.util.LazyOptional;
|
|||
import net.minecraftforge.items.IItemHandler;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.registries.IForgeRegistry;
|
||||
import org.apache.commons.lang3.tuple.ImmutableTriple;
|
||||
import top.theillusivec4.curios.api.CuriosApi;
|
||||
import top.theillusivec4.curios.api.SlotResult;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
|
@ -310,7 +310,7 @@ public final class Helper {
|
|||
|
||||
public static ItemStack getEquippedItem(Predicate<ItemStack> predicate, Player player) {
|
||||
if (Compat.hasCompat("curios")) {
|
||||
var stack = CuriosApi.getCuriosHelper().findEquippedCurio(predicate, player).map(ImmutableTriple::getRight);
|
||||
var stack = CuriosApi.getCuriosHelper().findFirstCurio(player, predicate).map(SlotResult::stack);
|
||||
if (stack.isPresent())
|
||||
return stack.get();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,24 +36,18 @@ import java.util.function.BiConsumer;
|
|||
import java.util.function.Supplier;
|
||||
|
||||
/**
|
||||
* The main class of the Nature's Aura API. This is where you can find recipe
|
||||
* lists and the {@link IInternalHooks} instance, which can be used to hook into
|
||||
* internal mod functions not exposed to the API.
|
||||
* The main class of the Nature's Aura API. This is where you can find recipe lists and the {@link IInternalHooks} instance, which can be used to hook into internal mod functions not exposed to the API.
|
||||
*/
|
||||
public final class NaturesAuraAPI {
|
||||
|
||||
public static final String MOD_ID = "naturesaura";
|
||||
|
||||
/**
|
||||
* A map of all the block states that the Botanist's Pickaxe can convert
|
||||
* into their mossy variations. Contains mossy brick and mossy cobblestone
|
||||
* by default, along with all blocks specified in the config file
|
||||
* A map of all the block states that the Botanist's Pickaxe can convert into their mossy variations. Contains mossy brick and mossy cobblestone by default, along with all blocks specified in the config file
|
||||
*/
|
||||
public static final BiMap<BlockState, BlockState> BOTANIST_PICKAXE_CONVERSIONS = HashBiMap.create();
|
||||
/**
|
||||
* A map of all {@link IAuraType} instances which are types of Aura present
|
||||
* in different types of levels. {@link BasicAuraType} instances can be
|
||||
* easily registered using {@link BasicAuraType#register()}.
|
||||
* A map of all {@link IAuraType} instances which are types of Aura present in different types of levels. {@link BasicAuraType} instances can be easily registered using {@link BasicAuraType#register()}.
|
||||
*/
|
||||
public static final Map<ResourceLocation, IAuraType> AURA_TYPES = new HashMap<>();
|
||||
public static final BasicAuraType TYPE_OVERWORLD = new BasicAuraType(new ResourceLocation(NaturesAuraAPI.MOD_ID, "overworld"), Level.OVERWORLD, 0x89cc37, 0).register();
|
||||
|
|
@ -61,75 +55,50 @@ public final class NaturesAuraAPI {
|
|||
public static final BasicAuraType TYPE_END = new BasicAuraType(new ResourceLocation(NaturesAuraAPI.MOD_ID, "end"), Level.END, 0x302624, 0).register();
|
||||
public static final BasicAuraType TYPE_OTHER = new BasicAuraType(new ResourceLocation(NaturesAuraAPI.MOD_ID, "other"), null, 0x2fa8a0, Integer.MIN_VALUE).register();
|
||||
/**
|
||||
* A map of all {@link IDrainSpotEffect} suppliers which are effects that
|
||||
* happen passively at every spot that Aura has been drained from in the
|
||||
* level. These effects include things like vegetational increase and
|
||||
* natural decay. To register your own drain spot effects, just add a
|
||||
* supplier for them to this map, and they will automatically be executed
|
||||
* once a second for every drain spot currently loaded.
|
||||
* A map of all {@link IDrainSpotEffect} suppliers which are effects that happen passively at every spot that Aura has been drained from in the level. These effects include things like vegetational increase and natural decay. To register your own drain spot effects, just add a supplier for them to this map, and they will automatically be executed once a second for every drain spot currently loaded.
|
||||
*/
|
||||
public static final Map<ResourceLocation, Supplier<IDrainSpotEffect>> DRAIN_SPOT_EFFECTS = new HashMap<>();
|
||||
/**
|
||||
* A map of all effect powder type. The integer the effect is registered to
|
||||
* is the color that the powder and its effect should have. To check if a
|
||||
* powder is active in any given area, use {@link IInternalHooks#isEffectPowderActive(Level,
|
||||
* BlockPos, ResourceLocation)}
|
||||
* A map of all effect powder type. The integer the effect is registered to is the color that the powder and its effect should have. To check if a powder is active in any given area, use {@link IInternalHooks#isEffectPowderActive(Level, BlockPos, ResourceLocation)}
|
||||
*/
|
||||
public static final Map<ResourceLocation, Integer> EFFECT_POWDERS = new HashMap<>();
|
||||
/**
|
||||
* A map of all {@link IMultiblock} objects which are multiblock structures
|
||||
* that can easily be looped through and checked, and also easily created
|
||||
* using the multiblock maker debug tool.
|
||||
* A map of all {@link IMultiblock} objects which are multiblock structures that can easily be looped through and checked, and also easily created using the multiblock maker debug tool.
|
||||
*/
|
||||
public static final Map<ResourceLocation, IMultiblock> MULTIBLOCKS = new HashMap<>();
|
||||
/**
|
||||
* A list of all {@link WeightedOre} objects that represent ores that can
|
||||
* spawn inside of stone blocks in the overworld
|
||||
* A list of all {@link WeightedOre} objects that represent ores that can spawn inside of stone blocks in the overworld
|
||||
*/
|
||||
public static final List<WeightedOre> OVERWORLD_ORES = new ArrayList<>();
|
||||
/**
|
||||
* A list of all {@link WeightedOre} objects that represent ores that can
|
||||
* spawn inside netherrack blocks in the nether
|
||||
* A list of all {@link WeightedOre} objects that represent ores that can spawn inside netherrack blocks in the nether
|
||||
*/
|
||||
public static final List<WeightedOre> NETHER_ORES = new ArrayList<>();
|
||||
/**
|
||||
* A map of all the entities' registry names to the amounts of aura they
|
||||
* each generate in the projectile generator
|
||||
* A map of all the entities' registry names to the amounts of aura they each generate in the projectile generator
|
||||
*/
|
||||
public static final Map<EntityType<?>, Integer> PROJECTILE_GENERATIONS = new HashMap<>();
|
||||
/**
|
||||
* A map of all the items that cause the {@link WeatherType} to be changed
|
||||
* using the weather changer
|
||||
* A map of all the items that cause the {@link WeatherType} to be changed using the weather changer
|
||||
*/
|
||||
public static final Map<ItemStack, WeatherType> WEATHER_CHANGER_CONVERSIONS = new HashMap<>();
|
||||
/**
|
||||
* The capability for any item or block that stores Aura in the form of an
|
||||
* {@link IAuraContainer}
|
||||
* The capability for any item or block that stores Aura in the form of an {@link IAuraContainer}
|
||||
*/
|
||||
public static final Capability<IAuraContainer> CAP_AURA_CONTAINER = CapabilityManager.get(new CapabilityToken<>() {
|
||||
});
|
||||
/**
|
||||
* The capability for any item that can be recharged from an Aura storage
|
||||
* container like the Aura Cache in the form of {@link IAuraRecharge} by a
|
||||
* player holding it in their hand
|
||||
* The capability for any item that can be recharged from an Aura storage container like the Aura Cache in the form of {@link IAuraRecharge} by a player holding it in their hand
|
||||
*/
|
||||
public static final Capability<IAuraRecharge> CAP_AURA_RECHARGE = CapabilityManager.get(new CapabilityToken<>() {
|
||||
});
|
||||
/**
|
||||
* The capability that any chunk in a level has to store Aura in it. As this
|
||||
* is only applicable to chunks and all chunks in the level automatically
|
||||
* get assigned this capability, using it directly is not necessary for
|
||||
* addon developers. To retrieve this capability from any chunk, use the
|
||||
* helper method {@link IAuraChunk#getAuraChunk(net.minecraft.world.level.Level,
|
||||
* BlockPos)}.
|
||||
* The capability that any chunk in a level has to store Aura in it. As this is only applicable to chunks and all chunks in the level automatically get assigned this capability, using it directly is not necessary for addon developers. To retrieve this capability from any chunk, use the helper method {@link IAuraChunk#getAuraChunk(net.minecraft.world.level.Level, BlockPos)}.
|
||||
*/
|
||||
public static final Capability<IAuraChunk> CAP_AURA_CHUNK = CapabilityManager.get(new CapabilityToken<>() {
|
||||
});
|
||||
/**
|
||||
* The capability that any level has to store Nature's Aura specific data in
|
||||
* it. To retrieve this capability from any level, use the helper methods
|
||||
* {@link ILevelData#getLevelData(net.minecraft.world.level.Level)} or
|
||||
* {@link ILevelData#getOverworldData(net.minecraft.world.level.Level)}.
|
||||
* The capability that any level has to store Nature's Aura specific data in it. To retrieve this capability from any level, use the helper methods {@link ILevelData#getLevelData(net.minecraft.world.level.Level)} or {@link ILevelData#getOverworldData(net.minecraft.world.level.Level)}.
|
||||
*/
|
||||
public static final Capability<ILevelData> CAP_LEVEL_DATA = CapabilityManager.get(new CapabilityToken<>() {
|
||||
});
|
||||
|
|
@ -144,8 +113,7 @@ public final class NaturesAuraAPI {
|
|||
}
|
||||
|
||||
/**
|
||||
* This method returns the active {@link IInternalHooks} instance which can
|
||||
* be used to hook into the mod's internal functionalities.
|
||||
* This method returns the active {@link IInternalHooks} instance which can be used to hook into the mod's internal functionalities.
|
||||
*
|
||||
* @return The active {@link IInternalHooks} instance
|
||||
*/
|
||||
|
|
@ -159,11 +127,7 @@ public final class NaturesAuraAPI {
|
|||
public interface IInternalHooks {
|
||||
|
||||
/**
|
||||
* Helper method to extract aura from an {@link IAuraContainer} in the
|
||||
* supplied player's inventory or baubles slots. The method returns true
|
||||
* if the aura could be extracted. Note that, if the player is in
|
||||
* creative mode, this method will always return true and no extraction
|
||||
* will take place.
|
||||
* Helper method to extract aura from an {@link IAuraContainer} in the supplied player's inventory or baubles slots. The method returns true if the aura could be extracted. Note that, if the player is in creative mode, this method will always return true and no extraction will take place.
|
||||
*
|
||||
* @param player The player
|
||||
* @param amount The amount to extract
|
||||
|
|
@ -173,9 +137,7 @@ public final class NaturesAuraAPI {
|
|||
boolean extractAuraFromPlayer(Player player, int amount, boolean simulate);
|
||||
|
||||
/**
|
||||
* Helper method to insert aura into an {@link IAuraContainer} in the
|
||||
* supplied player's inventory or baubles slots. The method returns true
|
||||
* if the aura could be inserted.
|
||||
* Helper method to insert aura into an {@link IAuraContainer} in the supplied player's inventory or baubles slots. The method returns true if the aura could be inserted.
|
||||
*
|
||||
* @param player The player
|
||||
* @param amount The amount to insert
|
||||
|
|
@ -185,10 +147,7 @@ public final class NaturesAuraAPI {
|
|||
boolean insertAuraIntoPlayer(Player player, int amount, boolean simulate);
|
||||
|
||||
/**
|
||||
* This method can be used to spawn the magic particle effect used by
|
||||
* Nature's Aura. It will not have an effect on the client side, so if
|
||||
* you want to send it from the server side, you need to create your own
|
||||
* packet.
|
||||
* This method can be used to spawn the magic particle effect used by Nature's Aura. It will not have an effect on the client side, so if you want to send it from the server side, you need to create your own packet.
|
||||
*
|
||||
* @param posX The x position
|
||||
* @param posY The y position
|
||||
|
|
@ -199,20 +158,14 @@ public final class NaturesAuraAPI {
|
|||
* @param color The color the particle should have, in hex
|
||||
* @param scale The scale of the particle
|
||||
* @param maxAge The max age before the particle should die
|
||||
* @param gravity The amount of gravity the particle should have, can
|
||||
* be 0
|
||||
* @param gravity The amount of gravity the particle should have, can be 0
|
||||
* @param collision If the particle should collide with blocks
|
||||
* @param fade If the particle should slowly fade out or suddenly
|
||||
* disappear
|
||||
* @param fade If the particle should slowly fade out or suddenly disappear
|
||||
*/
|
||||
void spawnMagicParticle(double posX, double posY, double posZ, double motionX, double motionY, double motionZ, int color, float scale, int maxAge, float gravity, boolean collision, boolean fade);
|
||||
|
||||
/**
|
||||
* This method can be used to spawn the magic particle effect used by
|
||||
* Nature's Aura. The particle will be created to spawn at the start
|
||||
* position and move towards the end position, dying when it reaches it.
|
||||
* It will not have an effect on the client side, so if you want to send
|
||||
* it from the server side, you need to create your own packet.
|
||||
* This method can be used to spawn the magic particle effect used by Nature's Aura. The particle will be created to spawn at the start position and move towards the end position, dying when it reaches it. It will not have an effect on the client side, so if you want to send it from the server side, you need to create your own packet.
|
||||
*
|
||||
* @param startX The start x
|
||||
* @param startY The start y
|
||||
|
|
@ -227,18 +180,14 @@ public final class NaturesAuraAPI {
|
|||
void spawnParticleStream(float startX, float startY, float startZ, float endX, float endY, float endZ, float speed, int color, float scale);
|
||||
|
||||
/**
|
||||
* Sets wether Nature's Aura particles that are spawned will be rendered
|
||||
* with depth test enabled or not. Default value is true, please reset
|
||||
* after changing.
|
||||
* Sets wether Nature's Aura particles that are spawned will be rendered with depth test enabled or not. Default value is true, please reset after changing.
|
||||
*
|
||||
* @param depth Wether depth test should be enabled or not
|
||||
*/
|
||||
void setParticleDepth(boolean depth);
|
||||
|
||||
/**
|
||||
* Sets the range that Nature's Aura particles that are spawned will
|
||||
* have to have from the player at most to actually be spawned. Default
|
||||
* value is 32, please reset after changing.
|
||||
* Sets the range that Nature's Aura particles that are spawned will have to have from the player at most to actually be spawned. Default value is 32, please reset after changing.
|
||||
*
|
||||
* @param range The range that particle spawning should have
|
||||
*/
|
||||
|
|
@ -247,25 +196,17 @@ public final class NaturesAuraAPI {
|
|||
void setParticleCulling(boolean cull);
|
||||
|
||||
/**
|
||||
* This method is used to create a custom multiblock from within the
|
||||
* API. The multiblock will automatically be registered both to Nature's
|
||||
* Aura's multiblock registry and Patchouli's multiblock registry.
|
||||
* This method is used to create a custom multiblock from within the API. The multiblock will automatically be registered both to Nature's Aura's multiblock registry and Patchouli's multiblock registry.
|
||||
*
|
||||
* @param name The name the multiblock should have
|
||||
* @param pattern The pattern that the multiblock should have, where
|
||||
* each character is mapped to a raw matcher
|
||||
* @param rawMatchers Each char matcher in the form of the char followed
|
||||
* by a matcher, either in the form of a Block, an
|
||||
* BlockState or a {@link Matcher}, similar to the
|
||||
* old way that crafting recipes work.
|
||||
* @param pattern The pattern that the multiblock should have, where each character is mapped to a raw matcher
|
||||
* @param rawMatchers Each char matcher in the form of the char followed by a matcher, either in the form of a Block, an BlockState or a {@link Matcher}, similar to the old way that crafting recipes work.
|
||||
* @return the multiblock instance
|
||||
*/
|
||||
IMultiblock createMultiblock(ResourceLocation name, String[][] pattern, Object... rawMatchers);
|
||||
|
||||
/**
|
||||
* Get all the active effect powders in the given area and consume the
|
||||
* position and the range that they have. To register a powder with the
|
||||
* supplied name, use {@link #EFFECT_POWDERS}
|
||||
* Get all the active effect powders in the given area and consume the position and the range that they have. To register a powder with the supplied name, use {@link #EFFECT_POWDERS}
|
||||
*
|
||||
* @param level The level
|
||||
* @param area The area to find powders in
|
||||
|
|
@ -275,11 +216,7 @@ public final class NaturesAuraAPI {
|
|||
List<Tuple<Vec3, Integer>> getActiveEffectPowders(Level level, AABB area, ResourceLocation name);
|
||||
|
||||
/**
|
||||
* Returns true if there is an effect powder entity active anywhere
|
||||
* around the given position based on the radius it has. This is a
|
||||
* shorthand function of {@link #getActiveEffectPowders(Level,
|
||||
* net.minecraft.world.phys.AABB, ResourceLocation)} that returns true
|
||||
* if the list is non-empty
|
||||
* Returns true if there is an effect powder entity active anywhere around the given position based on the radius it has. This is a shorthand function of {@link #getActiveEffectPowders(Level, net.minecraft.world.phys.AABB, ResourceLocation)} that returns true if the list is non-empty
|
||||
*
|
||||
* @param level The level
|
||||
* @param pos The center position
|
||||
|
|
|
|||
|
|
@ -12,12 +12,9 @@ import org.apache.commons.lang3.tuple.Pair;
|
|||
import java.util.function.BiConsumer;
|
||||
|
||||
/**
|
||||
* A class whose instances hold information about the aura present in any given
|
||||
* {@link net.minecraft.world.level.chunk.LevelChunk}. To get an instance for a
|
||||
* chunk, use {@link #getAuraChunk(Level, BlockPos)}.
|
||||
* A class whose instances hold information about the aura present in any given {@link net.minecraft.world.level.chunk.LevelChunk}. To get an instance for a chunk, use {@link #getAuraChunk(Level, BlockPos)}.
|
||||
* <p>
|
||||
* It is not intended for API users to create custom implementation of this
|
||||
* class.
|
||||
* It is not intended for API users to create custom implementation of this class.
|
||||
*/
|
||||
public interface IAuraChunk extends INBTSerializable<CompoundTag> {
|
||||
|
||||
|
|
@ -27,8 +24,7 @@ public interface IAuraChunk extends INBTSerializable<CompoundTag> {
|
|||
int DEFAULT_AURA = 1000000;
|
||||
|
||||
/**
|
||||
* This method is used to get information about the Aura in any given chunk.
|
||||
* This is a convenience method.
|
||||
* This method is used to get information about the Aura in any given chunk. This is a convenience method.
|
||||
*
|
||||
* @param level The level
|
||||
* @param pos A position that the chunk contains
|
||||
|
|
@ -40,23 +36,19 @@ public interface IAuraChunk extends INBTSerializable<CompoundTag> {
|
|||
}
|
||||
|
||||
/**
|
||||
* This method uses the supplied consumer to iterate over all the drain
|
||||
* spots, represented as a position and the number of Aura in them, in any
|
||||
* given area.
|
||||
* This method uses the supplied consumer to iterate over all the drain spots, represented as a position and the number of Aura in them, in any given area.
|
||||
*
|
||||
* @param level The level
|
||||
* @param pos The center position
|
||||
* @param radius The radius around the center to search for spots in
|
||||
* @param consumer A consumer that gets given the position and amount of
|
||||
* aura in each drain spot found
|
||||
* @param consumer A consumer that gets given the position and amount of aura in each drain spot found
|
||||
*/
|
||||
static void getSpotsInArea(Level level, BlockPos pos, int radius, BiConsumer<BlockPos, Integer> consumer) {
|
||||
NaturesAuraAPI.instance().getAuraSpotsInArea(level, pos, radius, consumer);
|
||||
}
|
||||
|
||||
/**
|
||||
* Convenience method that adds up the amount of aura spots from {@link
|
||||
* #getSpotsInArea(Level, BlockPos, int, BiConsumer)} and returns it.
|
||||
* Convenience method that adds up the amount of aura spots from {@link #getSpotsInArea(Level, BlockPos, int, BiConsumer)} and returns it.
|
||||
*
|
||||
* @param level The level
|
||||
* @param pos The center position
|
||||
|
|
@ -68,68 +60,48 @@ public interface IAuraChunk extends INBTSerializable<CompoundTag> {
|
|||
}
|
||||
|
||||
/**
|
||||
* Convenience method that adds up all of the aura from each drain spot from
|
||||
* {@link #getSpotsInArea(Level, BlockPos, int, BiConsumer)} and
|
||||
* conveniently returns it. For a better visual display with a more gradual
|
||||
* increase, use {@link #triangulateAuraInArea(Level, BlockPos, int)}.
|
||||
* Convenience method that adds up all of the aura from each drain spot from {@link #getSpotsInArea(Level, BlockPos, int, BiConsumer)} and conveniently returns it. For a better visual display with a more gradual increase, use {@link #triangulateAuraInArea(Level, BlockPos, int)}.
|
||||
*
|
||||
* @param level The level
|
||||
* @param pos The center position
|
||||
* @param radius The radius around the center to search for spots in
|
||||
* @return The amount of Aura present in that area, based on the drain spots
|
||||
* that are found
|
||||
* @return The amount of Aura present in that area, based on the drain spots that are found
|
||||
*/
|
||||
static int getAuraInArea(Level level, BlockPos pos, int radius) {
|
||||
return NaturesAuraAPI.instance().getAuraInArea(level, pos, radius);
|
||||
}
|
||||
|
||||
/**
|
||||
* Convenience method that combines {@link #getAuraInArea(Level, BlockPos,
|
||||
* int)} and {@link #getSpotAmountInArea(Level, BlockPos, int)} to increase
|
||||
* performance.
|
||||
* Convenience method that combines {@link #getAuraInArea(Level, BlockPos, int)} and {@link #getSpotAmountInArea(Level, BlockPos, int)} to increase performance.
|
||||
*
|
||||
* @param level The level
|
||||
* @param pos The center position
|
||||
* @param radius The radius around the center to search for spots in
|
||||
* @return A pair of the amount of aura in the area as the {@link
|
||||
* Pair#getLeft()} entry, and the amount of aura spots in the area as the
|
||||
* {@link Pair#getRight()} entry
|
||||
* @return A pair of the amount of aura in the area as the {@link Pair#getLeft()} entry, and the amount of aura spots in the area as the {@link Pair#getRight()} entry
|
||||
*/
|
||||
static Pair<Integer, Integer> getAuraAndSpotAmountInArea(Level level, BlockPos pos, int radius) {
|
||||
return NaturesAuraAPI.instance().getAuraAndSpotAmountInArea(level, pos, radius);
|
||||
}
|
||||
|
||||
/**
|
||||
* Convenience method that adds up all of the aura from each drain spot from
|
||||
* {@link #getSpotsInArea(Level, BlockPos, int, BiConsumer)}, but multiplies
|
||||
* their amount by the percentual distance to the supplied position. This
|
||||
* will cause for a lot more gradual of an increase and decrease of Aura
|
||||
* when moving closer to actual spots. This should be used for visual
|
||||
* purposes as it is more performance intensive than {@link
|
||||
* #getAuraInArea(Level, BlockPos, int)}.
|
||||
* Convenience method that adds up all of the aura from each drain spot from {@link #getSpotsInArea(Level, BlockPos, int, BiConsumer)}, but multiplies their amount by the percentual distance to the supplied position. This will cause for a lot more gradual of an increase and decrease of Aura when moving closer to actual spots. This should be used for visual purposes as it is more performance intensive than {@link #getAuraInArea(Level, BlockPos, int)}.
|
||||
*
|
||||
* @param level The level
|
||||
* @param pos The center position
|
||||
* @param radius The radius around the center to search for spots in
|
||||
* @return The amount of Aura presetn in that area, based on the drain spots
|
||||
* that are found and their distance to the center
|
||||
* @return The amount of Aura presetn in that area, based on the drain spots that are found and their distance to the center
|
||||
*/
|
||||
static int triangulateAuraInArea(Level level, BlockPos pos, int radius) {
|
||||
return NaturesAuraAPI.instance().triangulateAuraInArea(level, pos, radius);
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the position of the lowest drain spot (meaning the
|
||||
* one that has the least Aura stored) in the given area. This should be
|
||||
* used with any machines that fill up Aura in an area, so that the most
|
||||
* drained spots get selected first. Note that, when there is no drain spot
|
||||
* with an amount lower than 0, the default will always be returned.
|
||||
* This method returns the position of the lowest drain spot (meaning the one that has the least Aura stored) in the given area. This should be used with any machines that fill up Aura in an area, so that the most drained spots get selected first. Note that, when there is no drain spot with an amount lower than 0, the default will always be returned.
|
||||
*
|
||||
* @param level The level
|
||||
* @param pos The center position
|
||||
* @param radius The radius around the center to search for spots in
|
||||
* @param defaultSpot A position that will be used to create a new drain
|
||||
* spot when none are found
|
||||
* @param defaultSpot A position that will be used to create a new drain spot when none are found
|
||||
* @return The position of the lowest drain spot
|
||||
*/
|
||||
static BlockPos getLowestSpot(Level level, BlockPos pos, int radius, BlockPos defaultSpot) {
|
||||
|
|
@ -137,17 +109,12 @@ public interface IAuraChunk extends INBTSerializable<CompoundTag> {
|
|||
}
|
||||
|
||||
/**
|
||||
* This method returns the position of the highest drain spot (meaning the
|
||||
* one that has the most Aura stored) in the given area. This should be used
|
||||
* with any machines that use up Aura so that the spots with the highest
|
||||
* amount are drained first. Note that, when there is no drain spot with an
|
||||
* amount greater than 0, the defautl will always be returned.
|
||||
* This method returns the position of the highest drain spot (meaning the one that has the most Aura stored) in the given area. This should be used with any machines that use up Aura so that the spots with the highest amount are drained first. Note that, when there is no drain spot with an amount greater than 0, the defautl will always be returned.
|
||||
*
|
||||
* @param level The level
|
||||
* @param pos The center position
|
||||
* @param radius The radius around the center to search for spots in
|
||||
* @param defaultSpot A position that will be used to create a new drain
|
||||
* spot when none are found
|
||||
* @param defaultSpot A position that will be used to create a new drain spot when none are found
|
||||
* @return The position of the highest drain spot
|
||||
*/
|
||||
static BlockPos getHighestSpot(Level level, BlockPos pos, int radius, BlockPos defaultSpot) {
|
||||
|
|
@ -155,48 +122,32 @@ public interface IAuraChunk extends INBTSerializable<CompoundTag> {
|
|||
}
|
||||
|
||||
/**
|
||||
* Drains the given amount of Aura from the given position. Returns the
|
||||
* amount of Aura that was drained.
|
||||
* Drains the given amount of Aura from the given position. Returns the amount of Aura that was drained.
|
||||
*
|
||||
* @param pos The position
|
||||
* @param amount The amount to drain
|
||||
* @param aimForZero If true, and draining the given amount would make the
|
||||
* level go from positive to negative, an amount will be
|
||||
* drained instead that will cause the spot's amount to be
|
||||
* 0.
|
||||
* @return The amount of Aura drained. Will only be different from the
|
||||
* supplied amount if stopAtZero is true
|
||||
* @param aimForZero If true, and draining the given amount would make the level go from positive to negative, an amount will be drained instead that will cause the spot's amount to be 0.
|
||||
* @return The amount of Aura drained. Will only be different from the supplied amount if stopAtZero is true
|
||||
*/
|
||||
int drainAura(BlockPos pos, int amount, boolean aimForZero, boolean simulate);
|
||||
|
||||
/**
|
||||
* Convenience version of {@link #drainAura(BlockPos, int, boolean,
|
||||
* boolean)} with aimForZero and simulate set to false, as this is the most
|
||||
* likely behavior you will want. Notice that {@link #storeAura(BlockPos,
|
||||
* int)} has aimForZero set to true.
|
||||
* Convenience version of {@link #drainAura(BlockPos, int, boolean, boolean)} with aimForZero and simulate set to false, as this is the most likely behavior you will want. Notice that {@link #storeAura(BlockPos, int)} has aimForZero set to true.
|
||||
*/
|
||||
int drainAura(BlockPos pos, int amount);
|
||||
|
||||
/**
|
||||
* Stores the given amount of Aura at the given position. Returns the amount
|
||||
* of Aura that was stored.
|
||||
* Stores the given amount of Aura at the given position. Returns the amount of Aura that was stored.
|
||||
*
|
||||
* @param pos The position
|
||||
* @param amount The amount to store
|
||||
* @param aimForZero If true, and storing the given amount would make the
|
||||
* level go from negative to positive, an amount will be
|
||||
* stored instead that will cause the spot's amount to be
|
||||
* 0.
|
||||
* @return The amount of Aura stored. Will only be different from the
|
||||
* supplied amount if stopAtZero is true
|
||||
* @param aimForZero If true, and storing the given amount would make the level go from negative to positive, an amount will be stored instead that will cause the spot's amount to be 0.
|
||||
* @return The amount of Aura stored. Will only be different from the supplied amount if stopAtZero is true
|
||||
*/
|
||||
int storeAura(BlockPos pos, int amount, boolean aimForZero, boolean simulate);
|
||||
|
||||
/**
|
||||
* Convenience version of {@link #storeAura(BlockPos, int, boolean,
|
||||
* boolean)} with aimForZero set to true and simulate set to false, as this
|
||||
* is the most likely behavior you will want. Notice that {@link
|
||||
* #drainAura(BlockPos, int)} has aimForZero set to false.
|
||||
* Convenience version of {@link #storeAura(BlockPos, int, boolean, boolean)} with aimForZero set to true and simulate set to false, as this is the most likely behavior you will want. Notice that {@link #drainAura(BlockPos, int)} has aimForZero set to false.
|
||||
*/
|
||||
int storeAura(BlockPos pos, int amount);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package de.ellpeck.naturesaura.api.aura.container;
|
|||
import de.ellpeck.naturesaura.api.aura.type.IAuraType;
|
||||
|
||||
public interface IAuraContainer {
|
||||
|
||||
int storeAura(int amountToStore, boolean simulate);
|
||||
|
||||
int drainAura(int amountToDrain, boolean simulate);
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import net.minecraft.world.level.block.state.BlockState;
|
|||
|
||||
public record Matcher(BlockState defaultState, ICheck check) {
|
||||
|
||||
public static Matcher wildcard() {
|
||||
public static Matcher any() {
|
||||
return new Matcher(Blocks.AIR.defaultBlockState(), null);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import net.minecraft.world.level.material.Material;
|
|||
import net.minecraft.world.phys.shapes.CollisionContext;
|
||||
import net.minecraft.world.phys.shapes.VoxelShape;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
|
||||
public class BlockAncientSapling extends BushBlock implements BonemealableBlock, IModItem, ICustomBlockState, ICustomItemModel {
|
||||
|
||||
|
|
@ -30,11 +31,13 @@ public class BlockAncientSapling extends BushBlock implements BonemealableBlock,
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockAncientSapling.SHAPE;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
|
||||
if (!level.isClientSide) {
|
||||
super.randomTick(state, level, pos, random);
|
||||
|
|
@ -55,7 +58,7 @@ public class BlockAncientSapling extends BushBlock implements BonemealableBlock,
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean isValidBonemealTarget(BlockGetter p_50897_, BlockPos p_50898_, BlockState p_50899_, boolean p_50900_) {
|
||||
public boolean isValidBonemealTarget(BlockGetter level, BlockPos pos, BlockState state, boolean b) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -68,7 +71,7 @@ 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 (ForgeEventFactory.saplingGrowTree(level, rand, pos)) {
|
||||
} else if (!ForgeEventFactory.blockGrowFeature(level, rand, pos, null).getResult().equals(Event.Result.DENY)) {
|
||||
ModFeatures.Configured.ANCIENT_TREE.value().place(level, level.getChunkSource().getGenerator(), rand, pos);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ public class BlockAnimalContainer extends BlockContainerImpl implements IVisuali
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockAnimalContainer.SHAPE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,10 @@ import de.ellpeck.naturesaura.blocks.tiles.ITickableBlockEntity;
|
|||
import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities;
|
||||
import de.ellpeck.naturesaura.data.BlockStateGenerator;
|
||||
import de.ellpeck.naturesaura.data.ItemModelGenerator;
|
||||
import de.ellpeck.naturesaura.reg.*;
|
||||
import de.ellpeck.naturesaura.reg.ICustomBlockState;
|
||||
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.world.damagesource.DamageSource;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
|
|
@ -52,12 +55,14 @@ public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockS
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void entityInside(BlockState state, Level levelIn, BlockPos pos, Entity entityIn) {
|
||||
if (this == ModBlocks.AURA_CACTUS)
|
||||
entityIn.hurt(DamageSource.CACTUS, 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
var vec3d = state.getOffset(levelIn, pos);
|
||||
return BlockAuraBloom.SHAPE.move(vec3d.x, vec3d.y, vec3d.z);
|
||||
|
|
|
|||
|
|
@ -14,11 +14,13 @@ public class BlockAuraDetector extends BlockContainerImpl {
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public boolean hasAnalogOutputSignal(BlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public int getAnalogOutputSignal(BlockState blockState, Level levelIn, BlockPos pos) {
|
||||
var tile = levelIn.getBlockEntity(pos);
|
||||
if (tile instanceof BlockEntityAuraDetector detector)
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ public class BlockAuraTimer extends BlockContainerImpl implements ICustomBlockSt
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockAuraTimer.SHAPE;
|
||||
}
|
||||
|
|
@ -51,16 +52,19 @@ 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);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public boolean isSignalSource(BlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public int getSignal(BlockState state, BlockGetter level, BlockPos pos, Direction side) {
|
||||
return state.getValue(BlockStateProperties.POWERED) ? 15 : 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ public class BlockBlastFurnaceBooster extends BlockContainerImpl implements ICus
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockBlastFurnaceBooster.SHAPE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
package de.ellpeck.naturesaura.blocks;
|
||||
|
||||
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
|
||||
import de.ellpeck.naturesaura.api.aura.type.IAuraType;
|
||||
import de.ellpeck.naturesaura.data.BlockStateGenerator;
|
||||
import de.ellpeck.naturesaura.reg.ICustomBlockState;
|
||||
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.state.StateDefinition;
|
||||
import net.minecraft.world.level.block.state.properties.BooleanProperty;
|
||||
|
||||
public class BlockCatalyst extends BlockImpl implements ICustomBlockState {
|
||||
|
||||
public static final BooleanProperty NETHER = BlockNatureAltar.NETHER;
|
||||
|
||||
public BlockCatalyst(String baseName, Properties properties) {
|
||||
super(baseName, properties);
|
||||
this.registerDefaultState(this.defaultBlockState().setValue(BlockCatalyst.NETHER, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockPlaceContext context) {
|
||||
var nether = IAuraType.forLevel(context.getLevel()).isSimilar(NaturesAuraAPI.TYPE_NETHER);
|
||||
return super.getStateForPlacement(context).setValue(BlockCatalyst.NETHER, nether);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
super.createBlockStateDefinition(builder);
|
||||
builder.add(BlockCatalyst.NETHER);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateCustomBlockState(BlockStateGenerator generator) {
|
||||
generator.models().cubeAll(this.getBaseName(), generator.modLoc("block/" + this.getBaseName()));
|
||||
generator.models().cubeAll(this.getBaseName() + "_nether", generator.modLoc("block/" + this.getBaseName() + "_nether"));
|
||||
}
|
||||
}
|
||||
|
|
@ -77,6 +77,7 @@ public class BlockChunkLoader extends BlockContainerImpl implements IVisualizabl
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockChunkLoader.SHAPE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,11 +65,13 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem {
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public FluidState getFluidState(BlockState state) {
|
||||
return this.hasWaterlogging() && state.getValue(BlockStateProperties.WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public BlockState updateShape(BlockState stateIn, Direction facing, BlockState facingState, LevelAccessor levelIn, BlockPos currentPos, BlockPos facingPos) {
|
||||
if (this.hasWaterlogging() && stateIn.getValue(BlockStateProperties.WATERLOGGED))
|
||||
levelIn.scheduleTick(currentPos, Fluids.WATER, Fluids.WATER.getTickDelay(levelIn));
|
||||
|
|
@ -110,6 +112,7 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem {
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
|
||||
var drops = super.getDrops(state, builder);
|
||||
|
||||
|
|
@ -126,11 +129,11 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void playerWillDestroy(Level p_49852_, BlockPos p_49853_, BlockState p_49854_, Player p_49855_) {
|
||||
var tile = p_49852_.getBlockEntity(p_49853_);
|
||||
public void playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) {
|
||||
var tile = level.getBlockEntity(pos);
|
||||
if (tile instanceof BlockEntityImpl impl)
|
||||
impl.dropInventory();
|
||||
super.playerWillDestroy(p_49852_, p_49853_, p_49854_, p_49855_);
|
||||
super.playerWillDestroy(level, pos, state, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -141,6 +144,7 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem {
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void neighborChanged(BlockState state, Level levelIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) {
|
||||
this.updateRedstoneState(levelIn, pos);
|
||||
}
|
||||
|
|
@ -157,6 +161,7 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem {
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void tick(BlockState state, ServerLevel levelIn, BlockPos pos, RandomSource random) {
|
||||
if (!levelIn.isClientSide) {
|
||||
var tile = levelIn.getBlockEntity(pos);
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ public class BlockDecayedLeaves extends BlockImpl implements ICustomBlockState {
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
|
||||
if (!level.isClientSide) {
|
||||
level.setBlockAndUpdate(pos, Blocks.AIR.defaultBlockState());
|
||||
|
|
|
|||
|
|
@ -7,7 +7,10 @@ import de.ellpeck.naturesaura.items.ModItems;
|
|||
import de.ellpeck.naturesaura.packet.PacketClient;
|
||||
import de.ellpeck.naturesaura.packet.PacketHandler;
|
||||
import de.ellpeck.naturesaura.packet.PacketParticles;
|
||||
import de.ellpeck.naturesaura.reg.*;
|
||||
import de.ellpeck.naturesaura.reg.ICustomBlockState;
|
||||
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.nbt.CompoundTag;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
|
|
@ -62,6 +65,7 @@ public class BlockDimensionRail extends BaseRailBlock implements IModItem, ICust
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
|
||||
var stack = player.getItemInHand(hand);
|
||||
if (stack.getItem() == ModItems.RANGE_VISUALIZER) {
|
||||
|
|
@ -133,6 +137,7 @@ public class BlockDimensionRail extends BaseRailBlock implements IModItem, ICust
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({"deprecation", "RedundantSuppression"})
|
||||
public Property<RailShape> getShapeProperty() {
|
||||
return BlockDimensionRail.SHAPE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,10 +41,11 @@ public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockS
|
|||
super(Properties.of(Material.GRASS).noCollission().strength(0.5F).sound(SoundType.GRASS));
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
ModRegistry.ALL_ITEMS.add(this);
|
||||
ModRegistry.ALL_ITEMS.add(new ModTileType<BlockEntityEndFlower>(BlockEntityEndFlower::new, this));
|
||||
ModRegistry.ALL_ITEMS.add(new ModTileType<>(BlockEntityEndFlower::new, this));
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
var vec3d = state.getOffset(levelIn, pos);
|
||||
return BlockEndFlower.SHAPE.move(vec3d.x, vec3d.y, vec3d.z);
|
||||
|
|
@ -104,6 +105,7 @@ public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockS
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
|
||||
var tile = builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY);
|
||||
if (tile instanceof BlockEntityEndFlower f && f.isDrainMode)
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ 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);
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@ public class BlockFieldCreator extends BlockContainerImpl implements ICustomBloc
|
|||
}
|
||||
|
||||
@Override
|
||||
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult p_225533_6_) {
|
||||
@SuppressWarnings("deprecation")
|
||||
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult result) {
|
||||
var tile = levelIn.getBlockEntity(pos);
|
||||
if (tile instanceof BlockEntityFieldCreator) {
|
||||
if (!levelIn.isClientSide) {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public class BlockFurnaceHeater extends BlockContainerImpl implements ICustomBlo
|
|||
|
||||
public static final DirectionProperty FACING = BlockStateProperties.FACING;
|
||||
|
||||
private static final VoxelShape[] SHAPES = new VoxelShape[]{
|
||||
private static final VoxelShape[] SHAPES = {
|
||||
Block.box(2, 12, 2, 14, 16, 14), // Down
|
||||
Block.box(2, 0, 2, 14, 4, 14), // Up
|
||||
Block.box(2, 2, 12, 14, 14, 16), // North
|
||||
|
|
@ -79,6 +79,7 @@ public class BlockFurnaceHeater extends BlockContainerImpl implements ICustomBlo
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockFurnaceHeater.SHAPES[state.getValue(BlockFurnaceHeater.FACING).get3DDataValue()];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock,
|
|||
public static final EnumProperty<RedstoneSide> EAST = BlockStateProperties.EAST_REDSTONE;
|
||||
public static final EnumProperty<RedstoneSide> SOUTH = BlockStateProperties.SOUTH_REDSTONE;
|
||||
public static final EnumProperty<RedstoneSide> WEST = BlockStateProperties.WEST_REDSTONE;
|
||||
protected static final VoxelShape[] SHAPES = new VoxelShape[]{Block.box(3.0D, 0.0D, 3.0D, 13.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 3.0D, 13.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 3.0D, 13.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 3.0D, 13.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 0.0D, 13.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 0.0D, 13.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 0.0D, 13.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 0.0D, 13.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 3.0D, 16.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 3.0D, 16.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 3.0D, 16.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 3.0D, 16.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 0.0D, 16.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D)};
|
||||
protected static final VoxelShape[] SHAPES = {Block.box(3.0D, 0.0D, 3.0D, 13.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 3.0D, 13.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 3.0D, 13.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 3.0D, 13.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 0.0D, 13.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 0.0D, 13.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 0.0D, 13.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 0.0D, 13.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 3.0D, 16.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 3.0D, 16.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 3.0D, 16.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 3.0D, 16.0D, 1.0D, 16.0D), Block.box(3.0D, 0.0D, 0.0D, 16.0D, 1.0D, 13.0D), Block.box(3.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D), Block.box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 13.0D), Block.box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D)};
|
||||
|
||||
public BlockGoldPowder() {
|
||||
super("gold_powder", Properties.copy(Blocks.REDSTONE_WIRE));
|
||||
|
|
@ -71,6 +71,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock,
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockGoldPowder.SHAPES[BlockGoldPowder.getShapeIndex(state)];
|
||||
}
|
||||
|
|
@ -83,6 +84,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock,
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public BlockState updateShape(BlockState stateIn, Direction facing, BlockState facingState, LevelAccessor levelIn, BlockPos currentPos, BlockPos facingPos) {
|
||||
if (facing == Direction.DOWN) {
|
||||
return stateIn;
|
||||
|
|
@ -116,6 +118,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock,
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public boolean canSurvive(BlockState state, LevelReader levelIn, BlockPos pos) {
|
||||
var blockpos = pos.below();
|
||||
var blockstate = levelIn.getBlockState(blockpos);
|
||||
|
|
@ -123,11 +126,13 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock,
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getCollisionShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return Shapes.empty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void onPlace(BlockState state, Level levelIn, BlockPos pos, BlockState oldState, boolean isMoving) {
|
||||
if (oldState.getBlock() != state.getBlock() && !levelIn.isClientSide) {
|
||||
for (var direction : Direction.Plane.VERTICAL) {
|
||||
|
|
@ -149,6 +154,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock,
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void onRemove(BlockState state, Level levelIn, BlockPos pos, BlockState newState, boolean isMoving) {
|
||||
if (!isMoving && state.getBlock() != newState.getBlock()) {
|
||||
super.onRemove(state, levelIn, pos, newState, isMoving);
|
||||
|
|
@ -173,6 +179,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock,
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void neighborChanged(BlockState state, Level levelIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) {
|
||||
if (!levelIn.isClientSide) {
|
||||
if (!state.canSurvive(levelIn, pos)) {
|
||||
|
|
@ -183,6 +190,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock,
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void updateIndirectNeighbourShapes(BlockState state, LevelAccessor levelIn, BlockPos pos, int flags, int recursionLeft) {
|
||||
var pool = new BlockPos.MutableBlockPos();
|
||||
for (var direction : Direction.Plane.HORIZONTAL) {
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return switch (state.getValue(BlockGratedChute.FACING)) {
|
||||
case DOWN -> BlockGratedChute.DOWN_SHAPE;
|
||||
|
|
@ -72,6 +73,7 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getInteractionShape(BlockState state, BlockGetter levelIn, BlockPos pos) {
|
||||
return switch (state.getValue(BlockGratedChute.FACING)) {
|
||||
case DOWN -> BlockGratedChute.DOWN_RAYTRACE_SHAPE;
|
||||
|
|
@ -84,6 +86,7 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
|
||||
if (!player.isCrouching())
|
||||
return InteractionResult.FAIL;
|
||||
|
|
@ -112,11 +115,13 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean hasAnalogOutputSignal(BlockState p_60457_) {
|
||||
@SuppressWarnings("deprecation")
|
||||
public boolean hasAnalogOutputSignal(BlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public int getAnalogOutputSignal(BlockState blockState, Level levelIn, BlockPos pos) {
|
||||
var tile = levelIn.getBlockEntity(pos);
|
||||
if (tile instanceof BlockEntityGratedChute) {
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ 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) {
|
||||
if (!player.isCrouching())
|
||||
return InteractionResult.FAIL;
|
||||
|
|
|
|||
|
|
@ -36,11 +36,13 @@ public class BlockLight extends BlockImpl implements ICustomBlockState, INoItemB
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockLight.SHAPE;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public boolean canBeReplaced(BlockState state, BlockPlaceContext useContext) {
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
package de.ellpeck.naturesaura.blocks;
|
||||
|
||||
import de.ellpeck.naturesaura.Helper;
|
||||
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
|
||||
import de.ellpeck.naturesaura.api.aura.type.IAuraType;
|
||||
import de.ellpeck.naturesaura.blocks.tiles.BlockEntityNatureAltar;
|
||||
import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities;
|
||||
import de.ellpeck.naturesaura.blocks.tiles.render.RenderNatureAltar;
|
||||
|
|
@ -14,29 +12,22 @@ 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.item.context.BlockPlaceContext;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.state.StateDefinition;
|
||||
import net.minecraft.world.level.block.state.properties.BooleanProperty;
|
||||
import net.minecraft.world.level.material.Material;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.shapes.CollisionContext;
|
||||
import net.minecraft.world.phys.shapes.Shapes;
|
||||
import net.minecraft.world.phys.shapes.VoxelShape;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class BlockNatureAltar extends BlockContainerImpl implements ITESRProvider<BlockEntityNatureAltar>, ICustomBlockState {
|
||||
|
||||
private static final VoxelShape SHAPE = Shapes.create(0, 0, 0, 1, 12 / 16F, 1);
|
||||
public static final BooleanProperty NETHER = BooleanProperty.create("nether");
|
||||
|
||||
public BlockNatureAltar() {
|
||||
super("nature_altar", BlockEntityNatureAltar.class, Block.Properties.of(Material.STONE).strength(4F));
|
||||
this.registerDefaultState(this.defaultBlockState().setValue(BlockNatureAltar.NETHER, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -45,32 +36,20 @@ public class BlockNatureAltar extends BlockContainerImpl implements ITESRProvide
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockNatureAltar.SHAPE;
|
||||
}
|
||||
|
||||
@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);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateCustomBlockState(BlockStateGenerator generator) {
|
||||
// noop
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
super.createBlockStateDefinition(builder);
|
||||
builder.add(BlockNatureAltar.NETHER);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockPlaceContext context) {
|
||||
var nether = IAuraType.forLevel(context.getLevel()).isSimilar(NaturesAuraAPI.TYPE_NETHER);
|
||||
return super.getStateForPlacement(context).setValue(BlockNatureAltar.NETHER, nether);
|
||||
generator.simpleBlock(this, generator.models().getExistingFile(generator.modLoc(this.getBaseName())));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ public class BlockNetherGrass extends BlockImpl implements ICustomBlockState, Bo
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void randomTick(BlockState state, ServerLevel levelIn, BlockPos pos, RandomSource random) {
|
||||
var up = pos.above();
|
||||
var upState = levelIn.getBlockState(up);
|
||||
|
|
|
|||
|
|
@ -36,11 +36,13 @@ 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);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockOfferingTable.SHAPE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ public class BlockPowderPlacer extends BlockContainerImpl implements ICustomBloc
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockPowderPlacer.SHAPE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,6 +79,7 @@ public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable,
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockSpawnLamp.SHAPE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ public class BlockSpring extends BlockContainerImpl implements ICustomBlockState
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({"deprecation", "RedundantSuppression"})
|
||||
public Optional<SoundEvent> getPickupSound() {
|
||||
return Fluids.WATER.getPickupSound();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ 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.item.ItemStack;
|
||||
import net.minecraft.world.item.crafting.Ingredient;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
import net.minecraft.world.level.Level;
|
||||
|
|
@ -48,6 +49,7 @@ public class BlockWoodStand extends BlockContainerImpl implements ITESRProvider<
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) {
|
||||
return BlockWoodStand.SHAPE;
|
||||
}
|
||||
|
|
@ -58,8 +60,7 @@ public class BlockWoodStand extends BlockContainerImpl implements ITESRProvider<
|
|||
var pos = event.getPos();
|
||||
if (!level.isClientSide() && level instanceof Level) {
|
||||
if (Multiblocks.TREE_RITUAL.isComplete((Level) level, pos)) {
|
||||
var sapling = level.getBlockState(pos);
|
||||
var saplingStack = sapling.getBlock().getCloneItemStack(level, pos, sapling);
|
||||
var saplingStack = new ItemStack(level.getBlockState(pos).getBlock());
|
||||
if (!saplingStack.isEmpty()) {
|
||||
for (var recipe : ((Level) level).getRecipeManager().getRecipesFor(ModRecipes.TREE_RITUAL_TYPE, null, null)) {
|
||||
if (recipe.saplingType.test(saplingStack)) {
|
||||
|
|
@ -100,6 +101,7 @@ public class BlockWoodStand extends BlockContainerImpl implements ITESRProvider<
|
|||
}
|
||||
|
||||
@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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.blocks;
|
|||
|
||||
import net.minecraft.world.level.block.Block;
|
||||
|
||||
@SuppressWarnings("FieldNamingConvention")
|
||||
@SuppressWarnings("NonConstantFieldWithUpperCaseName")
|
||||
public final class ModBlocks {
|
||||
|
||||
public static Block ANCIENT_LOG;
|
||||
|
|
|
|||
|
|
@ -4,41 +4,31 @@ import de.ellpeck.naturesaura.NaturesAura;
|
|||
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
|
||||
import de.ellpeck.naturesaura.api.multiblock.IMultiblock;
|
||||
import de.ellpeck.naturesaura.api.multiblock.Matcher;
|
||||
import de.ellpeck.naturesaura.blocks.BlockNatureAltar;
|
||||
import de.ellpeck.naturesaura.blocks.ModBlocks;
|
||||
import de.ellpeck.naturesaura.data.BlockTagProvider;
|
||||
import de.ellpeck.naturesaura.recipes.ModRecipes;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.SaplingBlock;
|
||||
import net.minecraft.world.level.material.Material;
|
||||
|
||||
public final class Multiblocks {
|
||||
|
||||
private static final String[][] ALTAR_PATTERN = new String[][]{
|
||||
public static final IMultiblock ALTAR = NaturesAuraAPI.instance().createMultiblock(
|
||||
new ResourceLocation(NaturesAura.MOD_ID, "altar"),
|
||||
new String[][]{
|
||||
{" M ", " ", " ", " ", "M M", " ", " ", " ", " M "},
|
||||
{" B ", " ", " ", " ", "B B", " ", " ", " ", " B "},
|
||||
{" B ", " ", " M M ", " ", "B 0 B", " ", " M M ", " ", " B "},
|
||||
{" ", " WBW ", " WBW ", " WWCWCWW ", " BBW WBB ", " WWCWCWW ", " WBW ", " WBW ", " "}};
|
||||
public static final IMultiblock ALTAR = NaturesAuraAPI.instance().createMultiblock(
|
||||
new ResourceLocation(NaturesAura.MOD_ID, "altar"),
|
||||
Multiblocks.ALTAR_PATTERN,
|
||||
'C', Blocks.CHISELED_STONE_BRICKS,
|
||||
{" ", " WBW ", " WBW ", " WWCWCWW ", " BBW WBB ", " WWCWCWW ", " WBW ", " WBW ", " "}},
|
||||
'C', Matcher.tag(Blocks.CHISELED_STONE_BRICKS, BlockTagProvider.ALTAR_FANCY_BRICK),
|
||||
'B', Matcher.tag(Blocks.STONE_BRICKS, BlockTagProvider.ALTAR_STONE),
|
||||
'W', Matcher.tag(Blocks.OAK_PLANKS, BlockTagProvider.ALTAR_WOOD),
|
||||
'M', ModBlocks.GOLD_BRICK,
|
||||
'M', Matcher.tag(ModBlocks.GOLD_BRICK, BlockTagProvider.ALTAR_GOLD_BRICK),
|
||||
'0', ModBlocks.NATURE_ALTAR,
|
||||
' ', Matcher.wildcard());
|
||||
public static final IMultiblock NETHER_ALTAR = NaturesAuraAPI.instance().createMultiblock(
|
||||
new ResourceLocation(NaturesAura.MOD_ID, "nether_altar"),
|
||||
Multiblocks.ALTAR_PATTERN,
|
||||
'C', Blocks.RED_NETHER_BRICKS,
|
||||
'B', Matcher.tag(Blocks.NETHER_BRICKS, BlockTagProvider.NETHER_ALTAR_STONE),
|
||||
'W', Matcher.tag(Blocks.CRIMSON_PLANKS, BlockTagProvider.NETHER_ALTAR_WOOD),
|
||||
'M', ModBlocks.GOLD_NETHER_BRICK,
|
||||
'0', ModBlocks.NATURE_ALTAR.defaultBlockState().setValue(BlockNatureAltar.NETHER, true),
|
||||
' ', Matcher.wildcard());
|
||||
' ', Matcher.any());
|
||||
public static final IMultiblock TREE_RITUAL = NaturesAuraAPI.instance().createMultiblock(
|
||||
new ResourceLocation(NaturesAura.MOD_ID, "tree_ritual"),
|
||||
new String[][]{
|
||||
|
|
@ -52,14 +42,14 @@ public final class Multiblocks {
|
|||
return true;
|
||||
// try-catch to prevent blocks that need to have been placed crashing here
|
||||
try {
|
||||
var stack = state.getBlock().getCloneItemStack(level, pos, state);
|
||||
var stack = new ItemStack(state.getBlock());
|
||||
return !stack.isEmpty() && level.getRecipeManager().getRecipesFor(ModRecipes.TREE_RITUAL_TYPE, null, null).stream().anyMatch(r -> r.saplingType.test(stack));
|
||||
} catch (Exception e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
),
|
||||
' ', Matcher.wildcard());
|
||||
' ', Matcher.any());
|
||||
public static final IMultiblock POTION_GENERATOR = NaturesAuraAPI.instance().createMultiblock(
|
||||
new ResourceLocation(NaturesAura.MOD_ID, "potion_generator"),
|
||||
new String[][]{
|
||||
|
|
@ -70,7 +60,7 @@ public final class Multiblocks {
|
|||
'N', Blocks.NETHER_BRICKS,
|
||||
'R', Blocks.RED_NETHER_BRICKS,
|
||||
'0', ModBlocks.POTION_GENERATOR,
|
||||
' ', Matcher.wildcard());
|
||||
' ', Matcher.any());
|
||||
public static final IMultiblock OFFERING_TABLE = NaturesAuraAPI.instance().createMultiblock(
|
||||
new ResourceLocation(NaturesAura.MOD_ID, "offering_table"),
|
||||
new String[][]{
|
||||
|
|
@ -78,7 +68,7 @@ public final class Multiblocks {
|
|||
'R', new Matcher(Blocks.POPPY.defaultBlockState(),
|
||||
(level, start, offset, pos, state, c) -> state.is(BlockTags.SMALL_FLOWERS)),
|
||||
'0', ModBlocks.OFFERING_TABLE,
|
||||
' ', Matcher.wildcard());
|
||||
' ', Matcher.any());
|
||||
public static final IMultiblock ANIMAL_SPAWNER = NaturesAuraAPI.instance().createMultiblock(
|
||||
new ResourceLocation(NaturesAura.MOD_ID, "animal_spawner"),
|
||||
new String[][]{
|
||||
|
|
@ -88,7 +78,7 @@ public final class Multiblocks {
|
|||
'R', ModBlocks.INFUSED_BRICK,
|
||||
'W', ModBlocks.ANCIENT_PLANKS,
|
||||
'0', ModBlocks.ANIMAL_SPAWNER,
|
||||
' ', Matcher.wildcard());
|
||||
' ', Matcher.any());
|
||||
public static final IMultiblock AUTO_CRAFTER = NaturesAuraAPI.instance().createMultiblock(
|
||||
new ResourceLocation(NaturesAura.MOD_ID, "auto_crafter"),
|
||||
new String[][]{
|
||||
|
|
@ -96,7 +86,7 @@ public final class Multiblocks {
|
|||
'P', ModBlocks.ANCIENT_PLANKS,
|
||||
'L', ModBlocks.ANCIENT_LOG,
|
||||
'0', ModBlocks.AUTO_CRAFTER,
|
||||
' ', Matcher.wildcard());
|
||||
' ', Matcher.any());
|
||||
public static final IMultiblock RF_CONVERTER = NaturesAuraAPI.instance().createMultiblock(
|
||||
new ResourceLocation(NaturesAura.MOD_ID, "rf_converter"),
|
||||
new String[][]{
|
||||
|
|
@ -109,5 +99,5 @@ public final class Multiblocks {
|
|||
{" ", " ", " ", " R ", " ", " ", " "}},
|
||||
'R', Blocks.REDSTONE_BLOCK,
|
||||
'0', ModBlocks.RF_CONVERTER,
|
||||
' ', Matcher.wildcard());
|
||||
' ', Matcher.any());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -151,7 +151,8 @@ public class BlockEntityImpl extends BlockEntity {
|
|||
var compound = new CompoundTag();
|
||||
this.writeNBT(compound, SaveType.BLOCK);
|
||||
if (!compound.isEmpty()) {
|
||||
if (!regularItem.hasTag()) regularItem.setTag(new CompoundTag());
|
||||
if (!regularItem.hasTag())
|
||||
regularItem.setTag(new CompoundTag());
|
||||
regularItem.getTag().put("data", compound);
|
||||
}
|
||||
}
|
||||
|
|
@ -159,7 +160,8 @@ public class BlockEntityImpl extends BlockEntity {
|
|||
public void loadDataOnPlace(ItemStack stack) {
|
||||
if (stack.hasTag()) {
|
||||
var compound = stack.getTag().getCompound("data");
|
||||
if (compound != null) this.readNBT(compound, SaveType.BLOCK);
|
||||
if (compound != null)
|
||||
this.readNBT(compound, SaveType.BLOCK);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -57,11 +57,10 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable
|
|||
};
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public int bobTimer;
|
||||
public StructureState structureState = StructureState.INVALID;
|
||||
public boolean isComplete;
|
||||
|
||||
private AltarRecipe currentRecipe;
|
||||
private int timer;
|
||||
|
||||
private int lastAura;
|
||||
private boolean firstTick = true;
|
||||
|
||||
|
|
@ -79,7 +78,7 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable
|
|||
for (var z = -2; z <= 2; z += 4) {
|
||||
var offset = this.worldPosition.offset(x, 1, z);
|
||||
var state = this.level.getBlockState(offset);
|
||||
this.catalysts[index] = state.getBlock().getCloneItemStack(this.level, offset, state);
|
||||
this.catalysts[index] = new ItemStack(state.getBlock());
|
||||
index++;
|
||||
}
|
||||
}
|
||||
|
|
@ -87,18 +86,18 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable
|
|||
|
||||
if (!this.level.isClientSide) {
|
||||
if (this.level.getGameTime() % 40 == 0 || this.firstTick) {
|
||||
var newState = this.getNewState();
|
||||
if (newState != this.structureState) {
|
||||
this.structureState = newState;
|
||||
var complete = Multiblocks.ALTAR.isComplete(this.level, this.worldPosition);
|
||||
if (complete != this.isComplete) {
|
||||
this.isComplete = complete;
|
||||
this.sendToClients();
|
||||
}
|
||||
this.firstTick = false;
|
||||
}
|
||||
|
||||
if (this.structureState != StructureState.INVALID) {
|
||||
if (this.isComplete) {
|
||||
var type = IAuraType.forLevel(this.level);
|
||||
var space = this.container.storeAura(300, true);
|
||||
IAuraType expectedType = this.structureState == StructureState.NETHER ? NaturesAuraAPI.TYPE_NETHER : NaturesAuraAPI.TYPE_OVERWORLD;
|
||||
if (space > 0 && IAuraType.forLevel(this.level).isSimilar(expectedType)) {
|
||||
if (space > 0 && (type.isSimilar(NaturesAuraAPI.TYPE_OVERWORLD) || type.isSimilar(NaturesAuraAPI.TYPE_NETHER))) {
|
||||
var toStore = Math.min(IAuraChunk.getAuraInArea(this.level, this.worldPosition, 20), space);
|
||||
if (toStore > 0) {
|
||||
var spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 20, this.worldPosition);
|
||||
|
|
@ -167,7 +166,7 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable
|
|||
this.sendToClients();
|
||||
}
|
||||
} else {
|
||||
if (this.structureState != StructureState.INVALID) {
|
||||
if (this.isComplete) {
|
||||
if (rand.nextFloat() >= 0.7F) {
|
||||
var fourths = this.container.getMaxAura() / 4;
|
||||
if (this.container.getStoredAura() > 0) {
|
||||
|
|
@ -199,25 +198,17 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable
|
|||
}
|
||||
|
||||
private AltarRecipe getRecipeForInput(ItemStack input) {
|
||||
var type = IAuraType.forLevel(this.level);
|
||||
for (var recipe : this.level.getRecipeManager().getRecipesFor(ModRecipes.ALTAR_TYPE, null, null)) {
|
||||
if (recipe.input.test(input) && (recipe.requiredType == null || type.isSimilar(recipe.requiredType))) {
|
||||
if (recipe.input.test(input)) {
|
||||
if (recipe.catalyst == Ingredient.EMPTY)
|
||||
return recipe;
|
||||
for (var stack : this.catalysts)
|
||||
for (var stack : this.catalysts) {
|
||||
if (recipe.catalyst.test(stack))
|
||||
return recipe;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private StructureState getNewState() {
|
||||
if (Multiblocks.ALTAR.isComplete(this.level, this.worldPosition))
|
||||
return StructureState.OVERWORLD;
|
||||
if (Multiblocks.NETHER_ALTAR.isComplete(this.level, this.worldPosition))
|
||||
return StructureState.NETHER;
|
||||
return StructureState.INVALID;
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -225,7 +216,7 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable
|
|||
super.writeNBT(compound, type);
|
||||
if (type != SaveType.BLOCK) {
|
||||
compound.put("items", this.items.serializeNBT());
|
||||
compound.putString("state", this.structureState.name());
|
||||
compound.putBoolean("complete", this.isComplete);
|
||||
this.container.writeNBT(compound);
|
||||
}
|
||||
if (type == SaveType.TILE) {
|
||||
|
|
@ -241,8 +232,7 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable
|
|||
super.readNBT(compound, type);
|
||||
if (type != SaveType.BLOCK) {
|
||||
this.items.deserializeNBT(compound.getCompound("items"));
|
||||
if (compound.contains("state"))
|
||||
this.structureState = StructureState.valueOf(compound.getString("state"));
|
||||
this.isComplete = compound.getBoolean("complete");
|
||||
this.container.readNBT(compound);
|
||||
}
|
||||
if (type == SaveType.TILE) {
|
||||
|
|
@ -263,10 +253,4 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable
|
|||
public IItemHandlerModifiable getItemHandler() {
|
||||
return this.items;
|
||||
}
|
||||
|
||||
public enum StructureState {
|
||||
INVALID,
|
||||
NETHER,
|
||||
OVERWORLD
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ public class BlockEntityPlacer extends BlockEntityImpl implements ITickableBlock
|
|||
for (var y = -range; y <= range; y++)
|
||||
for (var z = -range; z <= range; z++) {
|
||||
var pos = this.worldPosition.offset(x, y, z);
|
||||
if (!this.framesContain(frames, pos, this.level.getBlockState(pos)))
|
||||
if (!this.framesContain(frames, this.level.getBlockState(pos)))
|
||||
continue;
|
||||
|
||||
var up = pos.above();
|
||||
|
|
@ -82,8 +82,8 @@ public class BlockEntityPlacer extends BlockEntityImpl implements ITickableBlock
|
|||
}
|
||||
}
|
||||
|
||||
private boolean framesContain(List<ItemFrame> frames, BlockPos pos, BlockState state) {
|
||||
var stack = state.getBlock().getCloneItemStack(this.level, pos, state);
|
||||
private boolean framesContain(List<ItemFrame> frames, BlockState state) {
|
||||
var stack = new ItemStack(state.getBlock());
|
||||
if (stack.isEmpty())
|
||||
return false;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ import net.minecraft.nbt.CompoundTag;
|
|||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.common.capabilities.ForgeCapabilities;
|
||||
import net.minecraftforge.common.util.LazyOptional;
|
||||
import net.minecraftforge.energy.CapabilityEnergy;
|
||||
import net.minecraftforge.energy.EnergyStorage;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ public class BlockEntityRFConverter extends BlockEntityImpl implements ITickable
|
|||
var tile = this.level.getBlockEntity(this.worldPosition.relative(facing));
|
||||
if (tile == null)
|
||||
continue;
|
||||
var storage = tile.getCapability(CapabilityEnergy.ENERGY, facing.getOpposite()).orElse(null);
|
||||
var storage = tile.getCapability(ForgeCapabilities.ENERGY, facing.getOpposite()).orElse(null);
|
||||
if (storage == null)
|
||||
continue;
|
||||
var canStore = storage.receiveEnergy(Integer.MAX_VALUE, true);
|
||||
|
|
@ -91,7 +91,7 @@ public class BlockEntityRFConverter extends BlockEntityImpl implements ITickable
|
|||
@Nullable
|
||||
@Override
|
||||
public <T> LazyOptional<T> getCapability(Capability<T> capability, @Nullable Direction facing) {
|
||||
if (capability == CapabilityEnergy.ENERGY)
|
||||
if (capability == ForgeCapabilities.ENERGY)
|
||||
return this.storageOptional.cast();
|
||||
else
|
||||
return super.getCapability(capability, facing);
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock
|
|||
|
||||
private boolean isLava(BlockPos offset, boolean source) {
|
||||
var state = this.level.getFluidState(offset);
|
||||
return (!source || state.isSource()) && state.getType().is(FluidTags.LAVA);
|
||||
return (!source || state.isSource()) && state.is(FluidTags.LAVA);
|
||||
}
|
||||
|
||||
private class InfiniteTank implements IFluidTank, IFluidHandler {
|
||||
|
|
@ -158,7 +158,7 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock
|
|||
|
||||
@Override
|
||||
public boolean isFluidValid(FluidStack stack) {
|
||||
return stack.getFluid().is(FluidTags.WATER);
|
||||
return stack.getFluid().defaultFluidState().is(FluidTags.WATER);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.blocks.tiles;
|
|||
|
||||
import net.minecraft.world.level.block.entity.BlockEntityType;
|
||||
|
||||
@SuppressWarnings("FieldNamingConvention")
|
||||
@SuppressWarnings("NonConstantFieldWithUpperCaseName")
|
||||
public final class ModBlockEntities {
|
||||
|
||||
public static BlockEntityType<BlockEntityAncientLeaves> ANCIENT_LEAVES;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,9 @@ import de.ellpeck.naturesaura.items.ItemAuraBottle;
|
|||
import net.minecraft.client.model.Model;
|
||||
import net.minecraft.client.model.geom.ModelPart;
|
||||
import net.minecraft.client.model.geom.PartPose;
|
||||
import net.minecraft.client.model.geom.builders.*;
|
||||
import net.minecraft.client.model.geom.builders.CubeListBuilder;
|
||||
import net.minecraft.client.model.geom.builders.LayerDefinition;
|
||||
import net.minecraft.client.model.geom.builders.MeshDefinition;
|
||||
import net.minecraft.client.renderer.MultiBufferSource;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
|
||||
|
|
|
|||
|
|
@ -197,6 +197,7 @@ public class AuraChunk implements IAuraChunk {
|
|||
return ret;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public Pair<BlockPos, Integer>[] getLowestAndHighestSpots(BlockPos pos, int radius) {
|
||||
var ret = this.limitSpotCache.get(pos, radius);
|
||||
if (ret == null) {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,10 @@ import net.minecraft.util.Mth;
|
|||
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.*;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.BushBlock;
|
||||
import net.minecraft.world.level.block.GrassBlock;
|
||||
import net.minecraft.world.level.block.LeavesBlock;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.chunk.LevelChunk;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import de.ellpeck.naturesaura.api.aura.type.IAuraType;
|
|||
import de.ellpeck.naturesaura.api.misc.WeightedOre;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.tags.TagKey;
|
||||
|
|
@ -29,6 +28,7 @@ import net.minecraft.world.phys.AABB;
|
|||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import net.minecraftforge.common.util.FakePlayerFactory;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
|
@ -113,11 +113,10 @@ public class OreSpawnEffect implements IDrainSpotEffect {
|
|||
var ore = WeightedRandom.getRandomItem(level.random, ores, totalWeight).orElse(null);
|
||||
if (ore == null)
|
||||
continue;
|
||||
var tag = TagKey.create(Registry.BLOCK_REGISTRY, ore.tag);
|
||||
var tag = TagKey.create(ForgeRegistries.Keys.BLOCKS, ore.tag);
|
||||
if (tag == null)
|
||||
continue;
|
||||
for (var holder : Registry.BLOCK.getTagOrEmpty(tag)) {
|
||||
var toPlace = holder.value();
|
||||
for (var toPlace : ForgeRegistries.BLOCKS.tags().getTag(tag)) {
|
||||
if (toPlace == null || toPlace == Blocks.AIR)
|
||||
continue;
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ public class AltarCategory implements IRecipeCategory<AltarRecipe> {
|
|||
public void setRecipe(IRecipeLayoutBuilder builder, AltarRecipe recipe, IFocusGroup focuses) {
|
||||
builder.addSlot(RecipeIngredientRole.INPUT, 1, 19).addItemStacks(Arrays.asList(recipe.input.getItems()));
|
||||
builder.addSlot(RecipeIngredientRole.OUTPUT, 81, 19).addItemStack(recipe.output);
|
||||
builder.addSlot(RecipeIngredientRole.CATALYST, 27, 19).addItemStacks(recipe.catalyst == Ingredient.EMPTY ? Collections.singletonList(this.altar) : Arrays.asList(recipe.catalyst.getItems()));
|
||||
builder.addSlot(RecipeIngredientRole.CATALYST, 52, 19).addItemStack(recipe.requiredType != null ? recipe.getDimensionBottle() : ItemStack.EMPTY);
|
||||
builder.addSlot(RecipeIngredientRole.CATALYST, 38, 19).addItemStacks(recipe.catalyst == Ingredient.EMPTY ? Collections.singletonList(this.altar) : Arrays.asList(recipe.catalyst.getItems()));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ public class ProcessorAltar implements IComponentProcessor {
|
|||
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 "type" -> this.recipe.requiredType != null ? IVariable.from(this.recipe.getDimensionBottle()) : null;
|
||||
case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString());
|
||||
default -> null;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ 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> NETHER_ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "nether_altar_wood"));
|
||||
public static final TagKey<Block> NETHER_ALTAR_STONE = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "nether_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 BlockTagProvider(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) {
|
||||
super(gen, NaturesAura.MOD_ID, existingFileHelper);
|
||||
|
|
@ -35,10 +35,10 @@ public class BlockTagProvider extends BlockTagsProvider {
|
|||
this.tag(BlockTags.SLABS).add(ModBlocks.ANCIENT_SLAB, ModBlocks.INFUSED_SLAB, ModBlocks.INFUSED_BRICK_SLAB);
|
||||
this.tag(BlockTags.DIRT).add(ModBlocks.NETHER_GRASS);
|
||||
this.tag(BlockTags.SMALL_FLOWERS).add(ModBlocks.END_FLOWER, ModBlocks.AURA_BLOOM);
|
||||
this.tag(BlockTagProvider.ALTAR_WOOD).addTag(BlockTags.PLANKS);
|
||||
this.tag(BlockTagProvider.ALTAR_STONE).addTag(BlockTags.STONE_BRICKS);
|
||||
this.tag(BlockTagProvider.NETHER_ALTAR_WOOD).add(Blocks.CRIMSON_PLANKS, Blocks.WARPED_PLANKS);
|
||||
this.tag(BlockTagProvider.NETHER_ALTAR_STONE).add(Blocks.NETHER_BRICKS);
|
||||
this.tag(BlockTagProvider.ALTAR_WOOD).addTag(BlockTags.PLANKS).add(Blocks.CRIMSON_PLANKS, Blocks.WARPED_PLANKS);
|
||||
this.tag(BlockTagProvider.ALTAR_STONE).addTag(BlockTags.STONE_BRICKS).add(Blocks.NETHER_BRICKS);
|
||||
this.tag(BlockTagProvider.ALTAR_GOLD_BRICK).add(ModBlocks.GOLD_BRICK, ModBlocks.GOLD_NETHER_BRICK);
|
||||
this.tag(BlockTagProvider.ALTAR_FANCY_BRICK).add(Blocks.RED_NETHER_BRICKS, Blocks.CHISELED_STONE_BRICKS);
|
||||
|
||||
for (var item : ModRegistry.ALL_ITEMS) {
|
||||
if (!(item instanceof Block b))
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.enchant;
|
|||
|
||||
import net.minecraft.world.item.enchantment.Enchantment;
|
||||
|
||||
@SuppressWarnings("FieldNamingConvention")
|
||||
@SuppressWarnings("NonConstantFieldWithUpperCaseName")
|
||||
public final class ModEnchantments {
|
||||
|
||||
public static Enchantment AURA_MENDING;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.entities;
|
|||
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
|
||||
@SuppressWarnings("FieldNamingConvention")
|
||||
@SuppressWarnings("NonConstantFieldWithUpperCaseName")
|
||||
public final class ModEntities {
|
||||
|
||||
public static EntityType<EntityMoverMinecart> MOVER_CART;
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ import net.minecraft.client.renderer.block.model.ItemTransforms;
|
|||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererProvider;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlas;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.inventory.InventoryMenu;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
|
@ -25,13 +25,13 @@ public class RenderEffectInhibitor extends EntityRenderer<EntityEffectInhibitor>
|
|||
|
||||
private final Map<ResourceLocation, ItemStack> items = new HashMap<>();
|
||||
|
||||
public RenderEffectInhibitor(EntityRendererProvider.Context p_174008_) {
|
||||
super(p_174008_);
|
||||
public RenderEffectInhibitor(EntityRendererProvider.Context ctx) {
|
||||
super(ctx);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getTextureLocation(EntityEffectInhibitor entity) {
|
||||
return TextureAtlas.LOCATION_BLOCKS;
|
||||
return InventoryMenu.BLOCK_ATLAS;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@ package de.ellpeck.naturesaura.entities.render;
|
|||
import net.minecraft.client.renderer.culling.Frustum;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererProvider;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlas;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.inventory.InventoryMenu;
|
||||
|
||||
public class RenderStub<T extends Entity> extends EntityRenderer<T> {
|
||||
|
||||
public RenderStub(EntityRendererProvider.Context p_174008_) {
|
||||
super(p_174008_);
|
||||
public RenderStub(EntityRendererProvider.Context ctx) {
|
||||
super(ctx);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -19,7 +19,7 @@ public class RenderStub<T extends Entity> extends EntityRenderer<T> {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getTextureLocation(T p_114482_) {
|
||||
return TextureAtlas.LOCATION_BLOCKS;
|
||||
public ResourceLocation getTextureLocation(T t) {
|
||||
return InventoryMenu.BLOCK_ATLAS;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ public class LevelGenAuraBloom extends Feature<NoneFeatureConfiguration> {
|
|||
|
||||
private boolean tryPlace(WorldGenLevel level, BlockPos pos) {
|
||||
var state = this.block.defaultBlockState();
|
||||
if (this.block.canSurvive(state, level, pos)) {
|
||||
if (state.canSurvive(level, pos)) {
|
||||
level.setBlock(pos, state, 3);
|
||||
var tile = level.getBlockEntity(pos);
|
||||
if (tile instanceof BlockEntityAuraBloom bloom)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,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("FieldNamingConvention")
|
||||
@SuppressWarnings("NonConstantFieldWithUpperCaseName")
|
||||
public final class ModFeatures {
|
||||
|
||||
public static Feature<TreeConfiguration> ANCIENT_TREE;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.gui;
|
|||
|
||||
import net.minecraft.world.inventory.MenuType;
|
||||
|
||||
@SuppressWarnings("FieldNamingConvention")
|
||||
@SuppressWarnings("NonConstantFieldWithUpperCaseName")
|
||||
public final class ModContainers {
|
||||
|
||||
public static MenuType<ContainerEnderCrate> ENDER_CRATE;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ import net.minecraft.world.entity.EquipmentSlot;
|
|||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.CreativeModeTab;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
|
@ -53,7 +52,7 @@ public class ItemAuraCache extends ItemImpl implements ITrinketItem {
|
|||
if (recharge != null) {
|
||||
if (recharge.rechargeFromContainer(container, itemSlot, i, player.getInventory().selected == i))
|
||||
break;
|
||||
} else if (EnchantmentHelper.getItemEnchantmentLevel(ModEnchantments.AURA_MENDING, stack) > 0) {
|
||||
} else if (stack.getEnchantmentLevel(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))
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.items;
|
|||
|
||||
import net.minecraft.world.item.Item;
|
||||
|
||||
@SuppressWarnings("FieldNamingConvention")
|
||||
@SuppressWarnings("NonConstantFieldWithUpperCaseName")
|
||||
public final class ModItems {
|
||||
|
||||
public static Item INFUSED_IRON_PICKAXE;
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ public class ItemArmor extends ArmorItem implements IModItem {
|
|||
if (equipped && !nbt.getBoolean(key)) {
|
||||
// we just equipped it
|
||||
nbt.putBoolean(key, true);
|
||||
// TODO use new forge attribute for step height
|
||||
player.maxUpStep = 1.1F;
|
||||
if (!speed.hasModifier(ItemArmor.SKY_MOVEMENT_MODIFIER))
|
||||
speed.addPermanentModifier(ItemArmor.SKY_MOVEMENT_MODIFIER);
|
||||
|
|
|
|||
|
|
@ -264,14 +264,12 @@ public class PacketParticles {
|
|||
level.random.nextGaussian() * 0.01F,
|
||||
0xd3e4ff, 1.5F, 150, 0F, false, true);
|
||||
}),
|
||||
PICKUP_STOPPER((message, level) -> {
|
||||
NaturesAuraAPI.instance().spawnMagicParticle(
|
||||
PICKUP_STOPPER((message, level) -> NaturesAuraAPI.instance().spawnMagicParticle(
|
||||
message.posX, message.posY + 0.4F, message.posZ,
|
||||
level.random.nextGaussian() * 0.005F,
|
||||
level.random.nextFloat() * 0.005F,
|
||||
level.random.nextGaussian() * 0.005F,
|
||||
0xcc3116, 1.5F, 40, 0F, false, true);
|
||||
}),
|
||||
0xcc3116, 1.5F, 40, 0F, false, true)),
|
||||
SPAWN_LAMP((message, level) -> {
|
||||
for (var i = level.random.nextInt(5) + 5; i >= 0; i--)
|
||||
NaturesAuraAPI.instance().spawnMagicParticle(
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.potion;
|
|||
|
||||
import net.minecraft.world.effect.MobEffect;
|
||||
|
||||
@SuppressWarnings("FieldNamingConvention")
|
||||
@SuppressWarnings("NonConstantFieldWithUpperCaseName")
|
||||
public final class ModPotions {
|
||||
|
||||
public static MobEffect BREATHLESS;
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class ClientProxy implements IProxy {
|
|||
this.addColorProvidingBlock(color);
|
||||
if (item instanceof IColorProvidingItem color)
|
||||
this.addColorProvidingItem(color);
|
||||
if (item instanceof ITESRProvider provider)
|
||||
if (item instanceof ITESRProvider<?> provider)
|
||||
provider.registerTESR();
|
||||
}
|
||||
|
||||
|
|
@ -75,6 +75,7 @@ public class ClientProxy implements IProxy {
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("removal")
|
||||
public void postInit(FMLCommonSetupEvent event) {
|
||||
// TODO this uses a vanilla model so we can't just add the json entry to it
|
||||
ItemBlockRenderTypes.setRenderLayer(ModBlocks.GOLD_POWDER, RenderType.cutoutMipped());
|
||||
|
|
@ -107,6 +108,7 @@ public class ClientProxy implements IProxy {
|
|||
var colors = Minecraft.getInstance().getItemColors();
|
||||
var color = item.getItemColor();
|
||||
|
||||
// TODO use event
|
||||
if (item instanceof Item) {
|
||||
colors.register(color, (Item) item);
|
||||
} else if (item instanceof Block) {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,7 @@
|
|||
package de.ellpeck.naturesaura.recipes;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
import de.ellpeck.naturesaura.NaturesAura;
|
||||
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
|
||||
import de.ellpeck.naturesaura.api.aura.type.IAuraType;
|
||||
import de.ellpeck.naturesaura.items.ItemAuraBottle;
|
||||
import de.ellpeck.naturesaura.items.ModItems;
|
||||
import net.minecraft.network.FriendlyByteBuf;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.crafting.Ingredient;
|
||||
|
|
@ -21,16 +15,14 @@ public class AltarRecipe extends ModRecipe {
|
|||
|
||||
public final Ingredient input;
|
||||
public final ItemStack output;
|
||||
public final IAuraType requiredType;
|
||||
public final Ingredient catalyst;
|
||||
public final int aura;
|
||||
public final int time;
|
||||
|
||||
public AltarRecipe(ResourceLocation name, Ingredient input, ItemStack output, IAuraType requiredType, Ingredient catalyst, int aura, int time) {
|
||||
public AltarRecipe(ResourceLocation name, Ingredient input, ItemStack output, Ingredient catalyst, int aura, int time) {
|
||||
super(name);
|
||||
this.input = input;
|
||||
this.output = output;
|
||||
this.requiredType = requiredType;
|
||||
this.catalyst = catalyst;
|
||||
this.aura = aura;
|
||||
this.time = time;
|
||||
|
|
@ -51,12 +43,6 @@ public class AltarRecipe extends ModRecipe {
|
|||
return ModRecipes.ALTAR_TYPE;
|
||||
}
|
||||
|
||||
public ItemStack getDimensionBottle() {
|
||||
var bottle = ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), this.requiredType);
|
||||
bottle.setHoverName(Component.translatable("info." + NaturesAura.MOD_ID + ".required_aura_type." + this.requiredType.getName()));
|
||||
return bottle;
|
||||
}
|
||||
|
||||
public static class Serializer implements RecipeSerializer<AltarRecipe> {
|
||||
|
||||
@Override
|
||||
|
|
@ -65,7 +51,6 @@ public class AltarRecipe extends ModRecipe {
|
|||
recipeId,
|
||||
Ingredient.fromJson(json.getAsJsonObject("input")),
|
||||
CraftingHelper.getItemStack(json.getAsJsonObject("output"), true),
|
||||
NaturesAuraAPI.AURA_TYPES.get(new ResourceLocation(json.get("aura_type").getAsString())),
|
||||
json.has("catalyst") ? Ingredient.fromJson(json.getAsJsonObject("catalyst")) : Ingredient.EMPTY,
|
||||
json.get("aura").getAsInt(),
|
||||
json.get("time").getAsInt());
|
||||
|
|
@ -78,7 +63,6 @@ public class AltarRecipe extends ModRecipe {
|
|||
recipeId,
|
||||
Ingredient.fromNetwork(buffer),
|
||||
buffer.readItem(),
|
||||
NaturesAuraAPI.AURA_TYPES.get(buffer.readResourceLocation()),
|
||||
Ingredient.fromNetwork(buffer),
|
||||
buffer.readInt(),
|
||||
buffer.readInt());
|
||||
|
|
@ -88,7 +72,6 @@ public class AltarRecipe extends ModRecipe {
|
|||
public void toNetwork(FriendlyByteBuf buffer, AltarRecipe recipe) {
|
||||
recipe.input.toNetwork(buffer);
|
||||
buffer.writeItem(recipe.output);
|
||||
buffer.writeResourceLocation(recipe.requiredType.getName());
|
||||
recipe.catalyst.toNetwork(buffer);
|
||||
buffer.writeInt(recipe.aura);
|
||||
buffer.writeInt(recipe.time);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package de.ellpeck.naturesaura.recipes;
|
|||
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
|
||||
import de.ellpeck.naturesaura.api.misc.WeatherType;
|
||||
import de.ellpeck.naturesaura.api.misc.WeightedOre;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
|
@ -11,6 +10,7 @@ import net.minecraft.world.item.Items;
|
|||
import net.minecraft.world.item.crafting.Recipe;
|
||||
import net.minecraft.world.item.crafting.RecipeSerializer;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -119,7 +119,7 @@ public final class ModRecipes {
|
|||
|
||||
@Override
|
||||
public String toString() {
|
||||
return Registry.RECIPE_TYPE.getKey(this).toString();
|
||||
return ForgeRegistries.RECIPE_TYPES.getKey(this).toString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
package de.ellpeck.naturesaura.reg;
|
||||
|
||||
public interface INoItemBlock {
|
||||
}
|
||||
public interface INoItemBlock {}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public enum ModArmorMaterial implements ArmorMaterial {
|
|||
INFUSED(NaturesAura.MOD_ID + ":infused_iron", 19, new int[]{2, 5, 6, 2}, 16, SoundEvents.ARMOR_EQUIP_GENERIC, 0, () -> Ingredient.of(ModItems.INFUSED_IRON)),
|
||||
SKY(NaturesAura.MOD_ID + ":sky", 33, new int[]{3, 6, 8, 3}, 12, SoundEvents.ARMOR_EQUIP_GENERIC, 2, () -> Ingredient.of(ModItems.SKY_INGOT));
|
||||
|
||||
private static final int[] MAX_DAMAGE_ARRAY = new int[]{13, 15, 16, 11};
|
||||
private static final int[] MAX_DAMAGE_ARRAY = {13, 15, 16, 11};
|
||||
private final String name;
|
||||
private final int maxDamageFactor;
|
||||
private final int[] damageReductionAmountArray;
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ public enum ModItemTier implements Tier {
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({"deprecation", "RedundantSuppression"})
|
||||
public int getLevel() {
|
||||
return this.harvestLevel;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ import de.ellpeck.naturesaura.potion.ModPotions;
|
|||
import de.ellpeck.naturesaura.potion.PotionBreathless;
|
||||
import de.ellpeck.naturesaura.recipes.EnabledCondition;
|
||||
import de.ellpeck.naturesaura.recipes.ModRecipes;
|
||||
import net.minecraft.data.worldgen.Structures;
|
||||
import net.minecraft.data.worldgen.features.FeatureUtils;
|
||||
import net.minecraft.data.worldgen.placement.PlacementUtils;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
|
@ -82,8 +81,8 @@ public final class ModRegistry {
|
|||
new BlockFurnaceHeater(),
|
||||
new BlockPotionGenerator(),
|
||||
new BlockAuraDetector(),
|
||||
new BlockCatalyst("conversion_catalyst", Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(2.5F)),
|
||||
new BlockCatalyst("crushing_catalyst", Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(2.5F)),
|
||||
new BlockImpl("conversion_catalyst", Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(2.5F)),
|
||||
new BlockImpl("crushing_catalyst", Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(2.5F)),
|
||||
new BlockFlowerGenerator(),
|
||||
new BlockPlacer(),
|
||||
new BlockHopperUpgrade(),
|
||||
|
|
@ -217,7 +216,7 @@ public final class ModRegistry {
|
|||
ModRegistry.ALL_ITEMS.add(new ModTileType<>(BlockEntityAuraBloom::new, "aura_bloom", ModRegistry.ALL_ITEMS.stream().filter(i -> i instanceof BlockAuraBloom).toArray(IModItem[]::new)));
|
||||
|
||||
for (var item : ModRegistry.ALL_ITEMS) {
|
||||
if (item instanceof ModTileType type)
|
||||
if (item instanceof ModTileType<?> type)
|
||||
h.register(new ResourceLocation(NaturesAura.MOD_ID, type.getBaseName()), type.type);
|
||||
}
|
||||
Helper.populateObjectHolders(ModBlockEntities.class, event.getForgeRegistry());
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"nether=false": {
|
||||
"model": "naturesaura:block/conversion_catalyst"
|
||||
},
|
||||
"nether=true": {
|
||||
"model": "naturesaura:block/conversion_catalyst_nether"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"nether=false": {
|
||||
"model": "naturesaura:block/crushing_catalyst"
|
||||
},
|
||||
"nether=true": {
|
||||
"model": "naturesaura:block/crushing_catalyst_nether"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"nether=false": {
|
||||
"model": "naturesaura:block/nature_altar"
|
||||
},
|
||||
"nether=true": {
|
||||
"model": "naturesaura:block/nature_altar_nether"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
{
|
||||
"name": "The Crimson Altar",
|
||||
"icon": "naturesaura:nature_altar",
|
||||
"category": "naturesaura:using",
|
||||
"advancement": "naturesaura:aura_bottle_nether",
|
||||
"priority": true,
|
||||
"turnin": "naturesaura:tainted_gold",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": "The $(l:using/altar)Natural Altar$(), while having the ability to turn iron into $(item)Infused Iron$(), does not fare well in different regions, specifically the $(thing)Nether$(), where a much darker type of $(aura) is present. Here, the $(item)Crimson Altar$() can be built. A structure very similar to the $(thing)Natural Altar$(), which is able to, instead, turn $(item)Gold$() into $(item)Tainted Gold$(). For this, the structure on the following page needs to be assembled."
|
||||
},
|
||||
{
|
||||
"type": "text",
|
||||
"text": "It should be noted that, while looking different, the $(item)Crimson Altar$() itself is in fact not a different block - it is merely the $(item)Natural Altar$()'s appearance in an area where ghostly $(aura) is present, caused by its inherent magical infusion with $(aura). Similar can be said for any $(item)Catalysts$(): Merely placing them on top of the crimson altar will cause their ghostly recipes to work as well."
|
||||
},
|
||||
{
|
||||
"type": "multiblock",
|
||||
"multiblock_id": "naturesaura:nether_altar",
|
||||
"text": "How to assemble the $(item)Crimson Altar$(). The $(item)Crimson Planks$() can be replaced with $(item)Warped Planks$()."
|
||||
},
|
||||
{
|
||||
"type": "crafting",
|
||||
"recipe": "naturesaura:gold_nether_brick",
|
||||
"text": "Creating the $(item)Golden Nether Bricks$() that are used in the $(item)Crimson Altar$()'s multiblock"
|
||||
},
|
||||
{
|
||||
"type": "naturesaura:altar",
|
||||
"text": "Creating $(item)Tainted Gold$(), a material blessed with the powers of ghostly $(aura).$(br)Note that the same infusion is possible using the materials' block form.",
|
||||
"recipe": "naturesaura:tainted_gold"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -18,20 +18,14 @@
|
|||
"group": "catalyst",
|
||||
"type": "patchouli:item",
|
||||
"item": "#catalyst",
|
||||
"x": 36,
|
||||
"y": 26
|
||||
},
|
||||
{
|
||||
"type": "patchouli:item",
|
||||
"item": "#type",
|
||||
"x": 58,
|
||||
"x": 48,
|
||||
"y": 26
|
||||
},
|
||||
{
|
||||
"group": "altar",
|
||||
"type": "patchouli:item",
|
||||
"item": "naturesaura:nature_altar",
|
||||
"x": 36,
|
||||
"x": 48,
|
||||
"y": 26
|
||||
},
|
||||
{
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 303 B |
Binary file not shown.
|
Before Width: | Height: | Size: 401 B |
Binary file not shown.
|
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 355 B |
Binary file not shown.
|
Before Width: | Height: | Size: 521 B After Width: | Height: | Size: 511 B |
Binary file not shown.
|
Before Width: | Height: | Size: 491 B After Width: | Height: | Size: 498 B |
Binary file not shown.
|
Before Width: | Height: | Size: 513 B After Width: | Height: | Size: 510 B |
|
|
@ -6,7 +6,6 @@
|
|||
"output": {
|
||||
"item": "minecraft:spectral_arrow"
|
||||
},
|
||||
"aura_type": "naturesaura:overworld",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:conversion_catalyst"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
"item": "minecraft:blaze_powder",
|
||||
"count": 4
|
||||
},
|
||||
"aura_type": "naturesaura:nether",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:crushing_catalyst"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
"item": "minecraft:bone_meal",
|
||||
"count": 6
|
||||
},
|
||||
"aura_type": "naturesaura:overworld",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:crushing_catalyst"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
"output": {
|
||||
"item": "minecraft:dragon_breath"
|
||||
},
|
||||
"aura_type": "naturesaura:nether",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:conversion_catalyst"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
"output": {
|
||||
"item": "minecraft:chorus_flower"
|
||||
},
|
||||
"aura_type": "naturesaura:overworld",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:conversion_catalyst"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
"output": {
|
||||
"item": "minecraft:coal"
|
||||
},
|
||||
"aura_type": "naturesaura:overworld",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:conversion_catalyst"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
"output": {
|
||||
"item": "minecraft:crimson_fungus"
|
||||
},
|
||||
"aura_type": "naturesaura:nether",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:conversion_catalyst"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
"output": {
|
||||
"item": "minecraft:egg"
|
||||
},
|
||||
"aura_type": "naturesaura:overworld",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:conversion_catalyst"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
"output": {
|
||||
"item": "minecraft:fermented_spider_eye"
|
||||
},
|
||||
"aura_type": "naturesaura:overworld",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:conversion_catalyst"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
"output": {
|
||||
"item": "minecraft:gilded_blackstone"
|
||||
},
|
||||
"aura_type": "naturesaura:nether",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:conversion_catalyst"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
"item": "minecraft:glowstone_dust",
|
||||
"count": 4
|
||||
},
|
||||
"aura_type": "naturesaura:nether",
|
||||
"catalyst": {
|
||||
"item": "naturesaura:crushing_catalyst"
|
||||
},
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue