diff --git a/build.gradle b/build.gradle index de6b5cd..795870a 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ dependencies { modLocalRuntime("me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}") modCompileOnly "maven.modrinth:yttr:${yttr_version}" - modLocalRuntime "maven.modrinth:yttr:${yttr_version}" + //modLocalRuntime "maven.modrinth:yttr:${yttr_version}" modImplementation("com.simibubi.create:create-fabric-1.18.2:${create_version}") diff --git a/src/main/java/com/github/ethanicuss/astraladditions/AstralAdditions.java b/src/main/java/com/github/ethanicuss/astraladditions/AstralAdditions.java index 3165d97..c93efe2 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/AstralAdditions.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/AstralAdditions.java @@ -1,8 +1,8 @@ package com.github.ethanicuss.astraladditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import com.github.ethanicuss.astraladditions.fluids.ModFluids; -import com.github.ethanicuss.astraladditions.particle.ModParticles; +import com.github.ethanicuss.astraladditions.registry.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModFluids; +import com.github.ethanicuss.astraladditions.registry.ModParticles; import com.github.ethanicuss.astraladditions.playertracker.WorldRegister; import com.github.ethanicuss.astraladditions.registry.*; import net.fabricmc.api.ModInitializer; @@ -18,17 +18,16 @@ public class AstralAdditions implements ModInitializer { public void onInitialize() { ModFluids.registerFluids(); - ModEntities.init(); + ModEntities.registerEntities(); ModBlocks.registerBlocks(); + ModBlocks.registerBlockItems(); ModItems.registerItems(); ModSounds.registerSounds(); - //DesizerRecipes.init(); ModRecipes.registerRecipes(); - ModEntitySpawn.addEntitySpawn(); - + ModEntitySpawns.registerEntitySpawn(); ModEffects.registerEffects(); ModParticles.registerParticles(); - + ModPotion.registerPotions(); LOGGER.info("Astral Additions is active!"); } } \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/AstralAdditionsClient.java b/src/main/java/com/github/ethanicuss/astraladditions/AstralAdditionsClient.java index 48a13a9..7bdb75e 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/AstralAdditionsClient.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/AstralAdditionsClient.java @@ -1,52 +1,24 @@ package com.github.ethanicuss.astraladditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import com.github.ethanicuss.astraladditions.entities.blackhole.BlackholeEntityRenderer; -import com.github.ethanicuss.astraladditions.fluids.ModFluids; -import com.github.ethanicuss.astraladditions.particle.ModParticlesClient; +import com.github.ethanicuss.astraladditions.registry.*; import com.github.ethanicuss.astraladditions.playertracker.PlayerTracker; -import com.github.ethanicuss.astraladditions.registry.ModBlocks; -import com.github.ethanicuss.astraladditions.registry.ModItemProperties; import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; -import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; -import net.fabricmc.fabric.api.client.render.fluid.v1.SimpleFluidRenderHandler; -import net.minecraft.client.render.RenderLayer; -import net.minecraft.client.render.entity.model.EntityModelLayer; -import net.minecraft.util.Identifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AstralAdditionsClient implements ClientModInitializer { - + public static final Logger LOGGER = LoggerFactory.getLogger(AstralAdditions.MOD_ID); public static PlayerTracker playerTracker = new PlayerTracker(); - public static final EntityModelLayer MODEL_MOONMAN_LAYER = new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "moonman"), "main"); - public static final EntityModelLayer MODEL_HEMOGIANT_LAYER = new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "hemogiant"), "main"); - public static final EntityModelLayer MODEL_VOIDTOUCHED_SKELETON_LAYER = new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "voidtouched_skeleton"), "main"); - public static final EntityModelLayer MODEL_VOIDTOUCHED_ZOMBIE_LAYER = new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "voidtouched_zombie"), "main"); - public static final EntityModelLayer MODEL_SHIMMER_BLAZE_LAYER = new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "shimmer_blaze"), "main"); - public static final EntityModelLayer MODEL_PHAST_LAYER = new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "phast"), "main"); - public static final EntityModelLayer MODEL_WHAST_LAYER = new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "whast"), "main"); - public static final EntityModelLayer MODEL_GLAZER_LAYER = new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "glazer"), "main"); - public static final EntityModelLayer MODEL_ENDER_WATCHER_LAYER = new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "ender_watcher"), "main"); - public static final EntityModelLayer MODEL_COGFLY_LAYER = new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "cogfly"), "main"); + + @Override public void onInitializeClient() { - FluidRenderHandlerRegistry.INSTANCE.register(ModFluids.STILL_SHIMMER, ModFluids.FLOWING_SHIMMER, new SimpleFluidRenderHandler( - new Identifier("astraladditions:block/shimmer"), - new Identifier("astraladditions:block/shimmer"), - 0xffd6fa - )); - FluidRenderHandlerRegistry.INSTANCE.register(ModFluids.STILL_SPUTUM, ModFluids.FLOWING_SPUTUM, new SimpleFluidRenderHandler( - new Identifier("astraladditions:block/sputum/sputum"), - new Identifier("astraladditions:block/sputum/sputum"), - 0xffffff - )); - FluidRenderHandlerRegistry.INSTANCE.setBlockTransparency(ModFluids.SPUTUM, true); - BlockRenderLayerMap.INSTANCE.putFluids(RenderLayer.getTranslucent(), ModFluids.STILL_SPUTUM, ModFluids.FLOWING_SPUTUM, ModFluids.STILL_SHIMMER, ModFluids.FLOWING_SHIMMER); - - ModEntities.initClient(); + ModEntities.registerClient(); ModBlocks.registerClient(); - ModParticlesClient.registerFactories(); - - ModItemProperties.register(); + ModFluids.registerFluidRenderersClient(); + ModParticles.registerClient(); + ModItemProperties.registerClient(); + ModPotion.registerClient(); + LOGGER.info("Astral Additions client is active!"); } } \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/BrambleboneBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/BrambleboneBlock.java index 47c80b4..f5f623c 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/BrambleboneBlock.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/BrambleboneBlock.java @@ -1,20 +1,15 @@ package com.github.ethanicuss.astraladditions.blocks; import com.github.ethanicuss.astraladditions.registry.ModBlocks; -import com.github.ethanicuss.astraladditions.registry.ModData; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.ShapeContext; import net.minecraft.entity.Entity; import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.entity.damage.DamageSource; import net.minecraft.server.world.ServerWorld; -import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; @@ -89,4 +84,4 @@ public void onEntityCollision(BlockState state, World world, BlockPos pos, Entit public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/BubbleBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/BubbleBlock.java index 5e87c5c..93f2837 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/BubbleBlock.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/BubbleBlock.java @@ -4,12 +4,9 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.Material; import net.minecraft.entity.Entity; -import net.minecraft.entity.FallingBlockEntity; import net.minecraft.particle.ParticleTypes; import net.minecraft.server.world.ServerWorld; -import net.minecraft.tag.BlockTags; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -26,4 +23,4 @@ public void onSteppedOn(World world, BlockPos pos, BlockState state, Entity enti super.onSteppedOn(world, pos, state, entity); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/CrackedIceBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/CrackedIceBlock.java index 9649613..e611844 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/CrackedIceBlock.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/CrackedIceBlock.java @@ -4,11 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.FallingBlockEntity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.particle.ParticleTypes; import net.minecraft.server.world.ServerWorld; import net.minecraft.tag.BlockTags; @@ -23,7 +19,6 @@ public CrackedIceBlock(Settings settings) { public void onSteppedOn(World world, BlockPos pos, BlockState state, Entity entity) { if (canFallThrough(world.getBlockState(pos.down())) && pos.getY() >= world.getBottomY() && !world.isClient()) { - FallingBlockEntity fallingBlockEntity = FallingBlockEntity.spawnFromBlock(world, pos, state); ModUtils.spawnForcedParticles((ServerWorld)world, ParticleTypes.SNOWFLAKE, pos.getX(), pos.getY(), pos.getZ(), 20, 0.5, 0.5, 0.5, 0.3); ModUtils.spawnForcedParticles((ServerWorld)world, ParticleTypes.CAMPFIRE_COSY_SMOKE, pos.getX(), pos.getY(), pos.getZ(), 3, 0.5, 0.5, 0.5, 0); } @@ -35,4 +30,4 @@ public static boolean canFallThrough(BlockState state) { Material material = state.getMaterial(); return state.isAir() || state.isIn(BlockTags.FIRE) || material.isLiquid() || material.isReplaceable(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/DesizerControllerBlockEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/DesizerControllerBlockEntity.java deleted file mode 100644 index e73758c..0000000 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/DesizerControllerBlockEntity.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.ethanicuss.astraladditions.blocks; - -import com.github.ethanicuss.astraladditions.registry.ModBlocks; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.math.BlockPos; - -public class DesizerControllerBlockEntity extends BlockEntity { - - public DesizerControllerBlockEntity(BlockPos pos, BlockState state) { - super(ModBlocks.JAR_BLOCKENTITY, pos, state); - } -} diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/DroptusBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/DroptusBlock.java index 40f72b6..10fd3c5 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/DroptusBlock.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/DroptusBlock.java @@ -3,20 +3,16 @@ import com.github.ethanicuss.astraladditions.registry.ModBlocks; import com.github.ethanicuss.astraladditions.registry.ModData; import net.minecraft.block.*; -import net.minecraft.entity.Entity; import net.minecraft.entity.ai.pathing.NavigationType; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.server.world.ServerWorld; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.IntProperty; import net.minecraft.state.property.Properties; -import net.minecraft.tag.FluidTags; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; @@ -116,4 +112,4 @@ protected void appendProperties(StateManager.Builder builder) public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/EnderTipBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/EnderTipBlock.java index 77a6272..b7d57a3 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/EnderTipBlock.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/EnderTipBlock.java @@ -1,7 +1,6 @@ package com.github.ethanicuss.astraladditions.blocks; import com.github.ethanicuss.astraladditions.registry.ModBlocks; -import com.github.ethanicuss.astraladditions.registry.ModData; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -42,4 +41,4 @@ public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/GeyserBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/GeyserBlock.java index 9a198cc..c72d838 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/GeyserBlock.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/GeyserBlock.java @@ -1,21 +1,15 @@ package com.github.ethanicuss.astraladditions.blocks; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.prismatic_geyser.PrismaticGeyserEntity; -import com.github.ethanicuss.astraladditions.entities.shimmerblaze.ShimmerBlazeRainEntity; import com.github.ethanicuss.astraladditions.util.ModUtils; -import io.github.fabricators_of_create.porting_lib.data.SoundDefinition; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.particle.ParticleTypes; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; @@ -26,7 +20,6 @@ import net.minecraft.world.World; import java.util.List; -import java.util.Random; public class GeyserBlock extends Block { @@ -65,4 +58,4 @@ public void onSteppedOn(World world, BlockPos pos, BlockState state, Entity enti super.onSteppedOn(world, pos, state, entity); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/LuneShroomBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/LuneShroomBlock.java index 81652a9..42c935e 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/LuneShroomBlock.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/LuneShroomBlock.java @@ -5,12 +5,7 @@ import net.minecraft.block.*; import net.minecraft.entity.Entity; import net.minecraft.entity.ai.pathing.NavigationType; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.server.world.ServerWorld; -import net.minecraft.state.StateManager; -import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.IntProperty; -import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; @@ -83,7 +78,6 @@ public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { @Override public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { - //entity.damage(DamageSource.CACTUS, 2.0f); } @Override @@ -105,4 +99,4 @@ public AbstractBlock.OffsetType getOffsetType() { public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/MultisidedBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/MultisidedBlock.java deleted file mode 100644 index 563732c..0000000 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/MultisidedBlock.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.github.ethanicuss.astraladditions.blocks; - -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalFacingBlock; -import net.minecraft.item.Wearable; -import net.minecraft.state.property.DirectionProperty; -import net.minecraft.util.math.Direction; - -public class MultisidedBlock extends HorizontalFacingBlock { - - public static final DirectionProperty FACING; - - public MultisidedBlock(Settings settings) { - super(settings); - this.setDefaultState((BlockState)((BlockState)this.stateManager.getDefaultState()).with(FACING, Direction.NORTH)); - } - static { - FACING = HorizontalFacingBlock.FACING; - } -} diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/DesizerCasingBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/desizer/DesizerCasingBlock.java similarity index 67% rename from src/main/java/com/github/ethanicuss/astraladditions/blocks/DesizerCasingBlock.java rename to src/main/java/com/github/ethanicuss/astraladditions/blocks/desizer/DesizerCasingBlock.java index 90c28e9..73488e9 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/DesizerCasingBlock.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/desizer/DesizerCasingBlock.java @@ -1,18 +1,13 @@ -package com.github.ethanicuss.astraladditions.blocks; +package com.github.ethanicuss.astraladditions.blocks.desizer; -import com.github.ethanicuss.astraladditions.registry.ModBlocks; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.HorizontalFacingBlock; -import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemPlacementContext; -import net.minecraft.item.ItemStack; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; import net.minecraft.util.StringIdentifiable; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.world.World; public class DesizerCasingBlock extends HorizontalFacingBlock { @@ -23,17 +18,6 @@ public DesizerCasingBlock(Settings settings) { this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(TYPE, Type.BASE)); } - //! This can be removed in a later update - @Override - public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) { - super.onPlaced(world, pos, state, placer, itemStack); - if (!world.isClient) { - if (state.getBlock() != ModBlocks.DESIZER_BASE) { - BlockState newBlockState = ModBlocks.DESIZER_BASE.getDefaultState(); - world.setBlockState(pos, newBlockState); - } - } - } @Override public BlockState getPlacementState(ItemPlacementContext ctx) { @@ -65,4 +49,4 @@ public String asString() { } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/DesizerControllerBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/desizer/DesizerControllerBlock.java similarity index 97% rename from src/main/java/com/github/ethanicuss/astraladditions/blocks/DesizerControllerBlock.java rename to src/main/java/com/github/ethanicuss/astraladditions/blocks/desizer/DesizerControllerBlock.java index 805255d..1263352 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/DesizerControllerBlock.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/desizer/DesizerControllerBlock.java @@ -1,4 +1,4 @@ -package com.github.ethanicuss.astraladditions.blocks; +package com.github.ethanicuss.astraladditions.blocks.desizer; import com.github.ethanicuss.astraladditions.recipes.DesizerRecipe; import com.github.ethanicuss.astraladditions.recipes.DesizerRecipes; @@ -93,10 +93,10 @@ private DesizerCasingBlock.Type getCasingType(BlockPos adjacentPos, BlockPos con final String yMath = yDiff == 1 ? "top" : yDiff == -1 ? "bottom" : "middle"; switch (direction.getOpposite()) { - case NORTH -> positionKey = yMath + (xDiff == -1 ? "left" : xDiff == 1 ? "right" : "middle"); - case EAST -> positionKey = yMath + (zDiff == -1 ? "left" : zDiff == 1 ? "right" : "middle"); - case SOUTH -> positionKey = yMath + (xDiff == 1 ? "left" : xDiff == -1 ? "right" : "middle"); - case WEST -> positionKey = yMath + (zDiff == 1 ? "left" : zDiff == -1 ? "right" : "middle"); + case NORTH -> positionKey = yMath + (xDiff == -1 ? "left" : xDiff == 1 ? "right" : "middle"); + case EAST -> positionKey = yMath + (zDiff == -1 ? "left" : zDiff == 1 ? "right" : "middle"); + case SOUTH -> positionKey = yMath + (xDiff == 1 ? "left" : xDiff == -1 ? "right" : "middle"); + case WEST -> positionKey = yMath + (zDiff == 1 ? "left" : zDiff == -1 ? "right" : "middle"); } assert positionKey != null; @@ -371,4 +371,4 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { protected void appendProperties(StateManager.Builder builder) { builder.add(FACING); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/JarBlock.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/jar/JarBlock.java similarity index 74% rename from src/main/java/com/github/ethanicuss/astraladditions/blocks/JarBlock.java rename to src/main/java/com/github/ethanicuss/astraladditions/blocks/jar/JarBlock.java index 02cdeb3..67e0c20 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/JarBlock.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/jar/JarBlock.java @@ -1,35 +1,16 @@ -package com.github.ethanicuss.astraladditions.blocks; +package com.github.ethanicuss.astraladditions.blocks.jar; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.BlockEntityTicker; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.block.entity.CampfireBlockEntity; -import net.minecraft.entity.Entity; -import net.minecraft.entity.data.DataTracker; -import net.minecraft.entity.data.TrackedData; -import net.minecraft.entity.data.TrackedDataHandlerRegistry; -import net.minecraft.entity.decoration.ItemFrameEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.recipe.CampfireCookingRecipe; -import net.minecraft.server.network.DebugInfoSender; -import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; -import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.event.GameEvent; -import org.jetbrains.annotations.Nullable; - -import java.util.Optional; -import java.util.stream.Stream; public class JarBlock extends Block implements BlockEntityProvider { public JarBlock(Settings settings) { @@ -67,9 +48,6 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt } } world.updateListeners(pos, oldState, state, Block.NOTIFY_LISTENERS); - //DebugInfoSender.sendNeighborUpdate(world, pos); - //world.updateNeighbor(pos, this, pos); - //world.emitGameEvent((Entity)player, GameEvent.BLOCK_CHANGE, pos); BlockPos goofyPos = new BlockPos(pos.getX(), -64, pos.getZ()); BlockState goofyState = world.getBlockState(goofyPos); @@ -90,4 +68,4 @@ public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity pl public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { return new JarBlockEntity(pos, state); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/JarBlockEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/jar/JarBlockEntity.java similarity index 81% rename from src/main/java/com/github/ethanicuss/astraladditions/blocks/JarBlockEntity.java rename to src/main/java/com/github/ethanicuss/astraladditions/blocks/jar/JarBlockEntity.java index 150a92d..30a2f98 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/JarBlockEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/jar/JarBlockEntity.java @@ -1,12 +1,11 @@ -package com.github.ethanicuss.astraladditions.blocks; +package com.github.ethanicuss.astraladditions.blocks.jar; +import com.github.ethanicuss.astraladditions.util.ImplementedInventory; import com.github.ethanicuss.astraladditions.registry.ModBlocks; -import com.github.ethanicuss.astraladditions.registry.ModItems; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.inventory.Inventories; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtList; import net.minecraft.network.Packet; @@ -17,7 +16,7 @@ import javax.annotation.Nullable; -public class JarBlockEntity extends BlockEntity implements ImplementedInventory{ +public class JarBlockEntity extends BlockEntity implements ImplementedInventory { private final DefaultedList item = DefaultedList.ofSize(1, ItemStack.EMPTY); public JarBlockEntity(BlockPos pos, BlockState state) { @@ -32,8 +31,6 @@ public DefaultedList getItems(){ @Override public void readNbt(NbtCompound nbt) { super.readNbt(nbt); - //this.item.set(0, ItemStack.EMPTY); - //this.item.set(1, ItemStack.EMPTY); Inventories.readNbt(nbt, this.item); } @@ -44,10 +41,6 @@ public void writeNbt(NbtCompound nbt) { NbtList nbtList = new NbtList(); { ItemStack itemStack = stacks.get(0); - //if (itemStack.isEmpty()) { - // System.out.println("it's empty"); - // continue; - //} NbtCompound nbtCompound = new NbtCompound(); nbtCompound.putByte("Slot", (byte)0); itemStack.writeNbt(nbtCompound); @@ -57,7 +50,6 @@ public void writeNbt(NbtCompound nbt) { nbt.put("Items", nbtList); } - //super.writeNbt(nbt); } @Nullable @@ -70,4 +62,4 @@ public Packet toUpdatePacket() { public NbtCompound toInitialChunkDataNbt() { return createNbt(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/JarBlockEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/blocks/jar/JarBlockEntityRenderer.java similarity index 81% rename from src/main/java/com/github/ethanicuss/astraladditions/blocks/JarBlockEntityRenderer.java rename to src/main/java/com/github/ethanicuss/astraladditions/blocks/jar/JarBlockEntityRenderer.java index 649562a..6566e40 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/JarBlockEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/blocks/jar/JarBlockEntityRenderer.java @@ -1,23 +1,16 @@ -package com.github.ethanicuss.astraladditions.blocks; +package com.github.ethanicuss.astraladditions.blocks.jar; -import com.github.ethanicuss.astraladditions.registry.ModItems; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.block.CampfireBlock; -import net.minecraft.block.entity.CampfireBlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.nbt.NbtCompound; import net.minecraft.util.collection.DefaultedList; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3f; @Environment(value= EnvType.CLIENT) diff --git a/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/AstralAdditionsREIClientPlugin.java b/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/AstralAdditionsREIClientPlugin.java index ca8e979..fc5de99 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/AstralAdditionsREIClientPlugin.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/AstralAdditionsREIClientPlugin.java @@ -18,10 +18,10 @@ import com.github.ethanicuss.astraladditions.compat.rei.yttr.soaking.SoakingDisplay; import com.github.ethanicuss.astraladditions.compat.rei.yttr.voidfiltering.VoidFilteringCategory; import com.github.ethanicuss.astraladditions.compat.rei.yttr.voidfiltering.VoidFilteringDisplay; -import com.github.ethanicuss.astraladditions.fluids.ModFluids; +import com.github.ethanicuss.astraladditions.registry.ModFluids; import com.github.ethanicuss.astraladditions.recipes.DesizerRecipe; import com.github.ethanicuss.astraladditions.recipes.TransmuteRecipe; -import com.github.ethanicuss.astraladditions.registry.ChromaticVacuumRecipe; +import com.github.ethanicuss.astraladditions.recipes.ChromaticVacuumRecipe; import com.github.ethanicuss.astraladditions.registry.ModBlocks; import com.github.ethanicuss.astraladditions.registry.ModItems; import com.unascribed.yttr.init.YEnchantments; @@ -115,8 +115,7 @@ public void registerDisplays(DisplayRegistry registry) { List transmuteRecipes = recipeManager.listAllOfType(TransmuteRecipe.Type.INSTANCE).stream().map(TransmuteDisplay::of).toList(); transmuteRecipes.forEach(registry::add); - List vacuumRecipes = recipeManager.listAllOfType(ChromaticVacuumRecipe.Type.INSTANCE).stream().map(VacuumDisplay::of).toList(); - vacuumRecipes.forEach(registry::add); + registry.registerFiller(ChromaticVacuumRecipe.class, VacuumDisplay::of); //* YTTR List centrifugeRecipes = recipeManager.listAllOfType(YRecipeTypes.CENTRIFUGING).stream().map(CentrifugeDisplay::of).toList(); diff --git a/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/transmute/TransmuteCategory.java b/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/transmute/TransmuteCategory.java index a1ee3ae..b0a324e 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/transmute/TransmuteCategory.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/transmute/TransmuteCategory.java @@ -2,8 +2,7 @@ import com.github.ethanicuss.astraladditions.compat.rei.AstralAdditionsREIClientPlugin; import com.github.ethanicuss.astraladditions.compat.rei.widgets.CurvedArrowWidget; -import com.github.ethanicuss.astraladditions.compat.rei.widgets.RotatedArrowWidget; -import com.github.ethanicuss.astraladditions.fluids.ModFluids; +import com.github.ethanicuss.astraladditions.registry.ModFluids; import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/vacuum/VacuumDisplay.java b/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/vacuum/VacuumDisplay.java index 5f920fc..e40e007 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/vacuum/VacuumDisplay.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/compat/rei/vacuum/VacuumDisplay.java @@ -1,31 +1,30 @@ package com.github.ethanicuss.astraladditions.compat.rei.vacuum; import com.github.ethanicuss.astraladditions.compat.rei.AstralAdditionsREIClientPlugin; -import com.github.ethanicuss.astraladditions.registry.ChromaticVacuumRecipe; +import com.github.ethanicuss.astraladditions.recipes.ChromaticVacuumRecipe; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.util.EntryIngredients; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Recipe; import net.minecraft.util.Identifier; import java.util.Collections; import java.util.List; +import java.util.Optional; public class VacuumDisplay extends BasicDisplay { - private final Identifier id; - private final List remainder; + private final List remainderEntries; - public VacuumDisplay(Identifier id, List inputs, List outputs, List remainder) { - super(inputs, outputs); - this.id = id; - this.remainder = remainder; - - } - - public List getRemainderEntries() { - return remainder; + public VacuumDisplay(Identifier id, + List inputs, + List outputs, + List remainder) { + super(inputs, outputs, Optional.ofNullable(id)); // REI 8.x ctor + this.remainderEntries = (remainder == null) ? Collections.emptyList() : remainder; } @Override @@ -33,22 +32,27 @@ public CategoryIdentifier getCategoryIdentifier() { return AstralAdditionsREIClientPlugin.VACUUM; } - public static VacuumDisplay of(Recipe recipe) { + public List getRemainderEntries() { + return remainderEntries; + } - ChromaticVacuumRecipe chromaticRecipe = (ChromaticVacuumRecipe) recipe; + /** Return null to let REI skip invalid/unsynced recipes. */ + public static VacuumDisplay of(Recipe recipe) { + if (!(recipe instanceof ChromaticVacuumRecipe chromatic)) return null; - List ingredient = Collections.singletonList( - EntryIngredients.of(chromaticRecipe.getIngredient()) - ); + ItemStack ing = chromatic.getIngredient(); // if yours actually returns Ingredient, change type + EntryIngredients.of(ing) + if (ing == null || ing.isEmpty()) return null; - List output = Collections.singletonList( - EntryIngredients.of(chromaticRecipe.getOutput()) - ); + ItemStack out = chromatic.getOutput(); + if (out == null || out.isEmpty()) return null; - List remainder = chromaticRecipe.hasRemainder() - ? Collections.singletonList(EntryIngredients.of(chromaticRecipe.getRemainder())) - : Collections.emptyList(); + List inputs = Collections.singletonList(EntryIngredients.of(ing)); + List outputs = Collections.singletonList(EntryIngredients.of(out)); + List remainders = + chromatic.hasRemainder() && chromatic.getRemainder() != null && !chromatic.getRemainder().isEmpty() + ? Collections.singletonList(EntryIngredients.of(chromatic.getRemainder())) + : Collections.emptyList(); - return new VacuumDisplay(recipe.getId(), ingredient, output, remainder); + return new VacuumDisplay(recipe.getId(), inputs, outputs, remainders); } } \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/effects/frost/FrostEffect.java b/src/main/java/com/github/ethanicuss/astraladditions/effects/frost/FrostEffect.java index 148898d..153c2e1 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/effects/frost/FrostEffect.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/effects/frost/FrostEffect.java @@ -1,16 +1,13 @@ package com.github.ethanicuss.astraladditions.effects.frost; import com.github.ethanicuss.astraladditions.AstralAdditions; -import net.minecraft.block.Blocks; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.attribute.AttributeContainer; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectCategory; -import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/effects/sinkeffect/SinkEffect.java b/src/main/java/com/github/ethanicuss/astraladditions/effects/sinkeffect/SinkEffect.java index 6b82597..b3f9bfc 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/effects/sinkeffect/SinkEffect.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/effects/sinkeffect/SinkEffect.java @@ -1,33 +1,19 @@ package com.github.ethanicuss.astraladditions.effects.sinkeffect; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.registry.ModEffects; -import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.attribute.AttributeContainer; -import net.minecraft.entity.attribute.EntityAttribute; -import net.minecraft.entity.attribute.EntityAttributeModifier; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectCategory; import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.function.BooleanBiFunction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.shape.VoxelShape; -import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.World; import org.slf4j.LoggerFactory; import org.slf4j.Logger; -import java.util.Collections; -import java.util.Map; - - public class SinkEffect extends StatusEffect { public static final Logger LOGGER = LoggerFactory.getLogger(AstralAdditions.MOD_ID); diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntity.java index df10907..a759103 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntity.java @@ -2,8 +2,6 @@ import com.github.ethanicuss.astraladditions.AstralAdditions; import com.github.ethanicuss.astraladditions.registry.ModItems; -import net.fabricmc.fabric.api.item.v1.FabricItem; -import net.fabricmc.fabric.impl.registry.sync.FabricRegistry; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.ItemEntity; @@ -11,20 +9,15 @@ import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedDataHandlerRegistry; -import net.minecraft.entity.mob.GhastEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.thrown.ThrownItemEntity; -import net.minecraft.inventory.Inventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.Identifier; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; -import net.minecraft.util.math.Vec3d; -import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; @@ -192,4 +185,4 @@ protected void initDataTracker() { this.dataTracker.startTracking(CURVE, 0.0f); this.dataTracker.startTracking(ITEM, "minecraft:dirt"); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntityRenderer.java index 351b479..1ac07f0 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntityRenderer.java @@ -1,7 +1,6 @@ package com.github.ethanicuss.astraladditions.entities.boomerang; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.cometball.CometballEntity; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; @@ -38,20 +37,6 @@ protected int getBlockLight(BoomerangEntity dragonFireballEntity, BlockPos block @Override public void render(BoomerangEntity entity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i) { - /*matrixStack.push(); - matrixStack.scale(1.0f, 1.0f, 1.0f); - matrixStack.multiply(this.dispatcher.getRotation()); - matrixStack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180.0f)); - MatrixStack.Entry entry = matrixStack.peek(); - Matrix4f matrix4f = entry.getPositionMatrix(); - Matrix3f matrix3f = entry.getNormalMatrix(); - VertexConsumer vertexConsumer = vertexConsumerProvider.getBuffer(RenderLayer.getEntityCutoutNoCull(TEXTURE)); - produceVertex(vertexConsumer, matrix4f, matrix3f, i, 0.0f, 0, 0, 1); - produceVertex(vertexConsumer, matrix4f, matrix3f, i, 1.0f, 0, 1, 1); - produceVertex(vertexConsumer, matrix4f, matrix3f, i, 1.0f, 1, 1, 0); - produceVertex(vertexConsumer, matrix4f, matrix3f, i, 0.0f, 1, 0, 0); - matrixStack.pop(); - super.render(dragonFireballEntity, f, g, matrixStack, vertexConsumerProvider, i);*/ ItemStack itemStack = entity.getRangItem(); if (itemStack != ItemStack.EMPTY || itemStack.isOf(Items.AIR)) { matrixStack.push(); diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/cogfly/CogflyEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/cogfly/CogflyEntity.java index 072fcb3..1a50934 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/cogfly/CogflyEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/cogfly/CogflyEntity.java @@ -1,7 +1,6 @@ package com.github.ethanicuss.astraladditions.entities.cogfly; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.boomerang.BoomerangEntity; import com.github.ethanicuss.astraladditions.registry.ModItems; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -10,7 +9,6 @@ import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedDataHandlerRegistry; -import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.thrown.ThrownItemEntity; import net.minecraft.item.Item; @@ -117,5 +115,4 @@ protected void initDataTracker() { this.dataTracker.startTracking(ITEM, "minecraft:dirt"); } -} - +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/cometball/CometballEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/cometball/CometballEntity.java index df7b99e..3b257e0 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/cometball/CometballEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/cometball/CometballEntity.java @@ -1,32 +1,16 @@ package com.github.ethanicuss.astraladditions.entities.cometball; -import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import com.github.ethanicuss.astraladditions.entities.moondragon.GluttonyBallEntity; -import com.github.ethanicuss.astraladditions.registry.ModItems; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; -import net.minecraft.entity.mob.BlazeEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.ExplosiveProjectileEntity; -import net.minecraft.entity.projectile.thrown.SnowballEntity; import net.minecraft.entity.projectile.thrown.ThrownItemEntity; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.particle.ItemStackParticleEffect; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -import java.util.Objects; public class CometballEntity extends ThrownItemEntity { @@ -78,4 +62,4 @@ protected void onCollision(HitResult hitResult) { this.discard(); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/cometball/CometballEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/cometball/CometballEntityRenderer.java index 02775b9..1981c44 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/cometball/CometballEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/cometball/CometballEntityRenderer.java @@ -1,7 +1,6 @@ package com.github.ethanicuss.astraladditions.entities.cometball; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.moondragon.GluttonyBallEntity; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.OverlayTexture; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntity.java index d1545ff..7e6b217 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntity.java @@ -1,18 +1,13 @@ package com.github.ethanicuss.astraladditions.entities.ender_watcher; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.moondragon.GluttonyBallEntity; -import com.github.ethanicuss.astraladditions.entities.shimmerblaze.ShimmerBlazeEntity; -import com.github.ethanicuss.astraladditions.entities.shimmerblaze.ShimmerBlazeRainEntity; -import com.github.ethanicuss.astraladditions.entities.shimmerblaze.SmallShimmerballEntity; import com.github.ethanicuss.astraladditions.util.ModUtils; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.goal.*; import net.minecraft.entity.attribute.DefaultAttributeContainer; import net.minecraft.entity.attribute.EntityAttributes; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.mob.BlazeEntity; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.entity.mob.MobEntity; @@ -27,12 +22,10 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; import net.minecraft.world.World; import net.minecraft.world.WorldEvents; import java.util.EnumSet; -import java.util.List; public class EnderWatcherEntity extends BlazeEntity { @@ -42,7 +35,11 @@ public EnderWatcherEntity(EntityType entityType, World wo } public static DefaultAttributeContainer.Builder createWatcherAttributes() { - return HostileEntity.createHostileAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 120).add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.12f).add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 16.0).add(EntityAttributes.GENERIC_FOLLOW_RANGE, 32.0); + return HostileEntity.createHostileAttributes() + .add(EntityAttributes.GENERIC_MAX_HEALTH, 120) + .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.12f) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 16.0) + .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 32.0); } @Override @@ -160,12 +157,6 @@ public void tick() { for (int i = 0; i < 1; ++i) { ModUtils.playSound((ServerWorld)this.blaze.world, this.blaze.getX(), this.blaze.getY(), this.blaze.getZ(), SoundEvents.ENTITY_SHULKER_OPEN, SoundCategory.HOSTILE, 1.0f, 1.1f + this.blaze.world.random.nextFloat() * 0.2f, true); this.blaze.playSound(SoundEvents.ENTITY_SHULKER_OPEN, 0.5f, 1.1f + this.blaze.world.random.nextFloat() * 0.2f); - /*SmallShimmerballEntity smallShimmerballEntity = new SmallShimmerballEntity(ModEntities.SMALL_SHIMMERBALL, this.blaze.world); - smallShimmerballEntity.setPosition(this.blaze.getX(), this.blaze.getBodyY(0.5) + 0.5, this.blaze.getZ()); - smallShimmerballEntity.refreshPositionAndAngles(this.blaze.getX(), this.blaze.getBodyY(0.5) + 0.5, this.blaze.getZ(), 0.0f, 0.0f); - double speed = 0.05; - smallShimmerballEntity.setVelocity(e * speed + this.blaze.getRandom().nextGaussian() * h, f * speed + this.blaze.getRandom().nextGaussian() * h, g * speed + this.blaze.getRandom().nextGaussian() * h); - this.blaze.world.spawnEntity(smallShimmerballEntity);*/ ItemStack arrow = new ItemStack(Items.SPECTRAL_ARROW); PersistentProjectileEntity persistentProjectileEntity = ProjectileUtil.createArrowProjectile(this.blaze, arrow, 3.0f); double dArrow = livingEntity.getX() - this.blaze.getX(); @@ -191,15 +182,9 @@ public void tick() { pPos = pPos.down(); stopper++; } - /*ShimmerBlazeRainEntity shimmerRain = new ShimmerBlazeRainEntity(ModEntities.SHIMMER_RAIN, this.blaze.world); - shimmerRain.setPosition(pPos.getX(), pPos.getY() - 0.5, pPos.getZ()); - shimmerRain.refreshPositionAndAngles(pPos.getX(), pPos.getY() - 0.5, pPos.getZ(), 0.0f, 0.0f); - this.blaze.world.spawnEntity(shimmerRain);*/ GluttonyBallEntity gluttonyBallEntity = new GluttonyBallEntity(ModEntities.GLUTTONY_BALL, this.blaze.world); gluttonyBallEntity.setPos(pPos.getX(), pPos.getY() - 0.5, pPos.getZ()); gluttonyBallEntity.refreshPositionAndAngles(pPos.getX(), pPos.getY() - 0.5, pPos.getZ(), 0.0f, 0.0f); - //double speed = 0.1; - //e.setVelocity((p.getX() - e.getX()) * speed - 0.1 + i * 0.1, (p.getY() - e.getY()) * speed - 0.2 + i * 0.2, (p.getZ() - e.getZ()) * speed - 0.1 + i * 0.1); this.blaze.world.spawnEntity(gluttonyBallEntity); } if (this.fireballCooldown == 0){ @@ -249,4 +234,4 @@ public String getAttack(){ return this.attack; } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntityModel.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntityModel.java index 2537de7..4822060 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntityModel.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntityModel.java @@ -6,7 +6,6 @@ import net.minecraft.client.model.*; -import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.render.entity.model.EntityModelLayer; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntityRenderer.java index 9e56d2b..1078faa 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/ender_watcher/EnderWatcherEntityRenderer.java @@ -1,11 +1,7 @@ package com.github.ethanicuss.astraladditions.entities.ender_watcher; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.AstralAdditionsClient; -import com.github.ethanicuss.astraladditions.entities.hemogiant.HemogiantEntity; -import com.github.ethanicuss.astraladditions.entities.hemogiant.HemogiantEntityModel; -import com.github.ethanicuss.astraladditions.entities.hemogiant.HemogiantEyesFeatureRenderer; -import net.minecraft.client.render.RenderLayer; +import com.github.ethanicuss.astraladditions.registry.ModEntityModelLayer; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.MobEntityRenderer; import net.minecraft.util.Identifier; @@ -13,11 +9,11 @@ public class EnderWatcherEntityRenderer extends MobEntityRenderer> { public EnderWatcherEntityRenderer(EntityRendererFactory.Context context) { - super(context, new EnderWatcherEntityModel(context.getPart(AstralAdditionsClient.MODEL_ENDER_WATCHER_LAYER)), 0.5f); + super(context, new EnderWatcherEntityModel(context.getPart(ModEntityModelLayer.MODEL_ENDER_WATCHER_LAYER)), 0.5f); } @Override public Identifier getTexture(EnderWatcherEntity entity){ return new Identifier(AstralAdditions.MOD_ID, "textures/entity/ender_watcher/texture_jelly.png"); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/glazer/GlazerEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/glazer/GlazerEntity.java index 0abad6a..34181e9 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/glazer/GlazerEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/glazer/GlazerEntity.java @@ -6,10 +6,6 @@ import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.passive.BeeEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.nbt.NbtHelper; -import net.minecraft.util.annotation.Debug; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class GlazerEntity extends BeeEntity { @@ -49,6 +45,11 @@ public void tickMovement() { } public static DefaultAttributeContainer.Builder createGlazerAttributes() { - return MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 18.0).add(EntityAttributes.GENERIC_FLYING_SPEED, 0.8f).add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.8f).add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 8.0).add(EntityAttributes.GENERIC_FOLLOW_RANGE, 32.0); + return MobEntity.createMobAttributes() + .add(EntityAttributes.GENERIC_MAX_HEALTH, 18.0) + .add(EntityAttributes.GENERIC_FLYING_SPEED, 0.8f) + .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.8f) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 8.0) + .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 32.0); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/glazer/GlazerEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/glazer/GlazerEntityRenderer.java index 500ac3d..a6031e6 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/glazer/GlazerEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/glazer/GlazerEntityRenderer.java @@ -1,17 +1,14 @@ package com.github.ethanicuss.astraladditions.entities.glazer; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.phast.PhastEntity; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.MobEntityRenderer; import net.minecraft.client.render.entity.model.BeeEntityModel; import net.minecraft.client.render.entity.model.EntityModelLayers; -import net.minecraft.client.render.entity.model.GhastEntityModel; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; @Environment(value= EnvType.CLIENT) public class GlazerEntityRenderer diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/hemogiant/HemogiantEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/hemogiant/HemogiantEntity.java index cd9af97..1b96af0 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/hemogiant/HemogiantEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/hemogiant/HemogiantEntity.java @@ -36,7 +36,12 @@ public HemogiantEntity(EntityType entityType, World wo } public static DefaultAttributeContainer.Builder createGluttonAttributes() { - return HostileEntity.createHostileAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, maxHP).add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.12f).add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 16.0).add(EntityAttributes.GENERIC_FOLLOW_RANGE, 32.0); + return HostileEntity.createHostileAttributes() + .add(EntityAttributes.GENERIC_MAX_HEALTH, maxHP) + .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.12f) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 16.0) + .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 32.0); + } @Override diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/hemogiant/HemogiantEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/hemogiant/HemogiantEntityRenderer.java index 38e93bd..dc08232 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/hemogiant/HemogiantEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/hemogiant/HemogiantEntityRenderer.java @@ -1,8 +1,7 @@ package com.github.ethanicuss.astraladditions.entities.hemogiant; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.AstralAdditionsClient; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntityModelLayer; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.MobEntityRenderer; import net.minecraft.util.Identifier; @@ -10,7 +9,7 @@ public class HemogiantEntityRenderer extends MobEntityRenderer> { public HemogiantEntityRenderer(EntityRendererFactory.Context context) { - super(context, new HemogiantEntityModel(context.getPart(AstralAdditionsClient.MODEL_HEMOGIANT_LAYER)), 0.5f); + super(context, new HemogiantEntityModel(context.getPart(ModEntityModelLayer.MODEL_HEMOGIANT_LAYER)), 0.5f); this.addFeature(new HemogiantEyesFeatureRenderer(this)); } @@ -18,4 +17,4 @@ public HemogiantEntityRenderer(EntityRendererFactory.Context context) { public Identifier getTexture(HemogiantEntity entity){ return new Identifier(AstralAdditions.MOD_ID, "textures/entity/glutton/glutton.png"); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/meteor_mitts/MeteorPunchEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/meteor_mitts/MeteorPunchEntity.java index 2c9d1ca..28e5a52 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/meteor_mitts/MeteorPunchEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/meteor_mitts/MeteorPunchEntity.java @@ -1,6 +1,5 @@ package com.github.ethanicuss.astraladditions.entities.meteor_mitts; -import com.github.ethanicuss.astraladditions.AstralAdditions; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -109,4 +108,4 @@ protected void onCollision(HitResult hitResult) { //this.world.sendEntityStatus(this, (byte)3); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/moondragon/GluttonyBallEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/moondragon/GluttonyBallEntity.java index d9d01ba..e0e9256 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/moondragon/GluttonyBallEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/moondragon/GluttonyBallEntity.java @@ -1,27 +1,20 @@ package com.github.ethanicuss.astraladditions.entities.moondragon; import net.minecraft.block.Blocks; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedDataHandlerRegistry; -import net.minecraft.entity.mob.GhastEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ExplosiveProjectileEntity; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.hit.HitResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; import net.minecraft.world.GameRules; import net.minecraft.world.World; import net.minecraft.world.explosion.Explosion; -import java.util.List; - public class GluttonyBallEntity extends ExplosiveProjectileEntity { private int timer = 240; @@ -121,4 +114,4 @@ protected ParticleEffect getParticleType() { protected boolean isBurning() { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/moonman/MoonmanEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/moonman/MoonmanEntity.java index 754897d..4326785 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/moonman/MoonmanEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/moonman/MoonmanEntity.java @@ -14,7 +14,11 @@ public MoonmanEntity(EntityType entityType, World worl } public static DefaultAttributeContainer.Builder createMoonmanAttributes() { - return HostileEntity.createHostileAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 30.0).add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.25f).add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 5.0).add(EntityAttributes.GENERIC_FOLLOW_RANGE, 16.0); + return HostileEntity.createHostileAttributes() + .add(EntityAttributes.GENERIC_MAX_HEALTH, 30.0) + .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.25f) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 5.0) + .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 16.0); } } \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/moonman/MoonmanEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/moonman/MoonmanEntityRenderer.java index 400537a..a54afeb 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/moonman/MoonmanEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/moonman/MoonmanEntityRenderer.java @@ -1,8 +1,7 @@ package com.github.ethanicuss.astraladditions.entities.moonman; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.AstralAdditionsClient; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntityModelLayer; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.MobEntityRenderer; import net.minecraft.util.Identifier; @@ -10,7 +9,7 @@ public class MoonmanEntityRenderer extends MobEntityRenderer> { public MoonmanEntityRenderer(EntityRendererFactory.Context context) { - super(context, new MoonmanEntityModel(context.getPart(AstralAdditionsClient.MODEL_MOONMAN_LAYER)), 0.5f); + super(context, new MoonmanEntityModel(context.getPart(ModEntityModelLayer.MODEL_MOONMAN_LAYER)), 0.5f); this.addFeature(new MoonmanEyesFeatureRenderer(this)); } @@ -18,4 +17,4 @@ public MoonmanEntityRenderer(EntityRendererFactory.Context context) { public Identifier getTexture(MoonmanEntity entity){ return new Identifier(AstralAdditions.MOD_ID, "textures/entity/moonman/moonman.png"); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/phast/PhastEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/phast/PhastEntity.java index 648e8c4..4a132c0 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/phast/PhastEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/phast/PhastEntity.java @@ -16,13 +16,11 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.FireballEntity; import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldEvents; -import net.minecraft.world.event.GameEvent; import net.minecraft.world.explosion.Explosion; import java.util.EnumSet; @@ -54,7 +52,8 @@ public int getFireballStrength() { } public static DefaultAttributeContainer.Builder createPhastAttributes() { - return MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 15.0).add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0); + return MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 15.0) + .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0); } @Override @@ -263,4 +262,4 @@ public void tick() { } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/phast/PhastEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/phast/PhastEntityRenderer.java index ddd10d8..e42fe17 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/phast/PhastEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/phast/PhastEntityRenderer.java @@ -4,12 +4,10 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.entity.EntityRendererFactory; -import net.minecraft.client.render.entity.GhastEntityRenderer; import net.minecraft.client.render.entity.MobEntityRenderer; import net.minecraft.client.render.entity.model.EntityModelLayers; import net.minecraft.client.render.entity.model.GhastEntityModel; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.entity.mob.GhastEntity; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/prismatic_geyser/PrismaticGeyserEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/prismatic_geyser/PrismaticGeyserEntity.java index e876ce3..24b07fa 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/prismatic_geyser/PrismaticGeyserEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/prismatic_geyser/PrismaticGeyserEntity.java @@ -1,6 +1,5 @@ package com.github.ethanicuss.astraladditions.entities.prismatic_geyser; -import com.github.ethanicuss.astraladditions.entities.shimmerblaze.ShimmerBlazeEntity; import com.github.ethanicuss.astraladditions.registry.ModEffects; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -85,4 +84,4 @@ public Packet createSpawnPacket() { public int getAge(){ return this.getDataTracker().get(AGE); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/pylon/PylonEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/pylon/PylonEntity.java index 4554e9a..45c4e68 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/pylon/PylonEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/pylon/PylonEntity.java @@ -1,23 +1,15 @@ package com.github.ethanicuss.astraladditions.entities.pylon; -import com.github.ethanicuss.astraladditions.AstralAdditions; import com.github.ethanicuss.astraladditions.registry.ModItems; -import net.minecraft.block.AbstractFireBlock; -import net.minecraft.client.MinecraftClient; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedDataHandlerRegistry; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.thrown.ThrownItemEntity; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.Packet; import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import java.awt.*; @@ -100,4 +92,4 @@ public void setPlayer(String name){ public String getPlayer(){ return this.player; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/pylon/PylonEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/pylon/PylonEntityRenderer.java index dbd67e2..31e2ac0 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/pylon/PylonEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/pylon/PylonEntityRenderer.java @@ -1,18 +1,15 @@ package com.github.ethanicuss.astraladditions.entities.pylon; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.meteor_mitts.MeteorPunchEntity; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.model.*; import net.minecraft.client.render.*; -import net.minecraft.client.render.entity.EnderDragonEntityRenderer; import net.minecraft.client.render.entity.EntityRenderer; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.model.EntityModelLayers; import net.minecraft.client.render.entity.model.EntityModelPartNames; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.entity.decoration.EndCrystalEntity; import net.minecraft.util.Identifier; import net.minecraft.util.math.*; @@ -91,4 +88,4 @@ public Identifier getTexture(PylonEntity endCrystalEntity) { protected int getBlockLight(PylonEntity pylonEntity, BlockPos blockPos) { return 15; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/scrap_projectile/ScrapProjectileEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/scrap_projectile/ScrapProjectileEntityRenderer.java index eae0040..0682786 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/scrap_projectile/ScrapProjectileEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/scrap_projectile/ScrapProjectileEntityRenderer.java @@ -1,7 +1,6 @@ package com.github.ethanicuss.astraladditions.entities.scrap_projectile; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.cometball.CometballEntity; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.OverlayTexture; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeEntity.java index e4a7d90..5d87dd3 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeEntity.java @@ -1,6 +1,6 @@ package com.github.ethanicuss.astraladditions.entities.shimmerblaze; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.util.ModUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -20,15 +20,11 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldEvents; import java.util.EnumSet; -import java.util.Iterator; import java.util.List; -import java.util.Set; -import java.util.stream.Stream; public class ShimmerBlazeEntity extends BlazeEntity { public ShimmerBlazeEntity(EntityType entityType, World world) { @@ -37,7 +33,11 @@ public ShimmerBlazeEntity(EntityType entityType, World wo } public static DefaultAttributeContainer.Builder createShimmerBlazeAttributes() { - return HostileEntity.createHostileAttributes().add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 8.0).add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.4f).add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0).add(EntityAttributes.GENERIC_MAX_HEALTH, 180.0); + return HostileEntity.createHostileAttributes() + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 8.0) + .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.4f) + .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0) + .add(EntityAttributes.GENERIC_MAX_HEALTH, 180.0); } @Override @@ -323,4 +323,4 @@ public boolean isOnFire() { public boolean hurtByWater() { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeEntityRenderer.java index e153378..a7b97d2 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeEntityRenderer.java @@ -1,18 +1,12 @@ package com.github.ethanicuss.astraladditions.entities.shimmerblaze; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.AstralAdditionsClient; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntityModelLayer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.BlazeEntityRenderer; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.client.render.entity.model.BlazeEntityModel; -import net.minecraft.client.render.entity.model.EntityModelLayers; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.entity.mob.BlazeEntity; -import net.minecraft.entity.mob.ZombieEntity; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; @@ -22,7 +16,7 @@ public class ShimmerBlazeEntityRenderer private static final Identifier TEXTURE = new Identifier(AstralAdditions.MOD_ID, "textures/entity/shimmer_blaze/shimmer_blaze.png"); public ShimmerBlazeEntityRenderer(EntityRendererFactory.Context context) { - super(context, new ShimmerBlazeEntityModel(context.getPart(AstralAdditionsClient.MODEL_SHIMMER_BLAZE_LAYER)), 0.5f); + super(context, new ShimmerBlazeEntityModel(context.getPart(ModEntityModelLayer.MODEL_SHIMMER_BLAZE_LAYER)), 0.5f); } @Override diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeRainEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeRainEntity.java index 5ead1d8..aebce58 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeRainEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/ShimmerBlazeRainEntity.java @@ -1,6 +1,5 @@ package com.github.ethanicuss.astraladditions.entities.shimmerblaze; -import com.github.ethanicuss.astraladditions.util.ModUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -8,12 +7,10 @@ import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedDataHandlerRegistry; -import net.minecraft.entity.mob.GhastEntity; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.Packet; import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket; import net.minecraft.particle.ParticleTypes; -import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.Box; import net.minecraft.world.World; @@ -79,4 +76,4 @@ public int getAge(){ public void setOwner(ShimmerBlazeEntity _owner){ this.owner = _owner; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/SmallShimmerballEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/SmallShimmerballEntity.java index 7a2e8ab..a1ddf11 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/SmallShimmerballEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerblaze/SmallShimmerballEntity.java @@ -1,17 +1,13 @@ package com.github.ethanicuss.astraladditions.entities.shimmerblaze; -import com.github.ethanicuss.astraladditions.fluids.ModFluids; +import com.github.ethanicuss.astraladditions.registry.ModFluids; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.mob.MobEntity; -import net.minecraft.entity.projectile.ExplosiveProjectileEntity; import net.minecraft.entity.projectile.SmallFireballEntity; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleTypes; -import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; @@ -63,13 +59,6 @@ protected void onEntityHit(EntityHitResult entityHitResult) { Explosion.DestructionType destructionType = Explosion.DestructionType.NONE; this.world.createExplosion(this, this.getX(), this.getY(), this.getZ(), 1.5f, destructionType); this.discard(); - /*Entity entity = entityHitResult.getEntity(); - Entity entity2 = this.getOwner(); - boolean bl = entity.damage(DamageSource.fireball(this, entity2), 5.0f); - if (!bl) { - } else if (entity2 instanceof LivingEntity) { - this.applyDamageEffects((LivingEntity)entity2, entity); - }*/ } @Override @@ -101,4 +90,4 @@ protected ParticleEffect getParticleType() { protected float getDrag() { return 1.05f; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerfishingrod/ShimmerFishingBobberEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerfishingrod/ShimmerFishingBobberEntity.java index 1a4988d..17c6b12 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerfishingrod/ShimmerFishingBobberEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/shimmerfishingrod/ShimmerFishingBobberEntity.java @@ -1,6 +1,6 @@ package com.github.ethanicuss.astraladditions.entities.shimmerfishingrod; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.mixin.fishing.FishingBobberEntityAccessor; import com.github.ethanicuss.astraladditions.registry.ModItems; import com.github.ethanicuss.astraladditions.util.FishingBobberStateHelper; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedskeleton/VoidtouchedSkeletonEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedskeleton/VoidtouchedSkeletonEntity.java index ce8a681..f530f3a 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedskeleton/VoidtouchedSkeletonEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedskeleton/VoidtouchedSkeletonEntity.java @@ -1,6 +1,5 @@ package com.github.ethanicuss.astraladditions.entities.voidtouchedskeleton; -import net.minecraft.block.Blocks; import net.minecraft.entity.EntityType; import net.minecraft.entity.attribute.DefaultAttributeContainer; import net.minecraft.entity.attribute.EntityAttributes; @@ -24,7 +23,11 @@ public VoidtouchedSkeletonEntity(EntityType } public static DefaultAttributeContainer.Builder createVoidtouchedSkeletonAttributes() { - return HostileEntity.createHostileAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 22.0).add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.3f).add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 5.0).add(EntityAttributes.GENERIC_FOLLOW_RANGE, 32.0); + return HostileEntity.createHostileAttributes() + .add(EntityAttributes.GENERIC_MAX_HEALTH, 22.0) + .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.3f) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 5.0) + .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 32.0); } @@ -50,4 +53,4 @@ protected void updatePostDeath() { } super.updatePostDeath(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedskeleton/VoidtouchedSkeletonEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedskeleton/VoidtouchedSkeletonEntityRenderer.java index 6317ffd..c0576e5 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedskeleton/VoidtouchedSkeletonEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedskeleton/VoidtouchedSkeletonEntityRenderer.java @@ -1,8 +1,7 @@ package com.github.ethanicuss.astraladditions.entities.voidtouchedskeleton; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.AstralAdditionsClient; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntityModelLayer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.entity.EntityRendererFactory; @@ -17,7 +16,7 @@ public class VoidtouchedSkeletonEntityRenderer private static final Identifier TEXTURE = new Identifier(AstralAdditions.MOD_ID, "textures/entity/voidtouched_skeleton/skeleton.png"); public VoidtouchedSkeletonEntityRenderer(EntityRendererFactory.Context context) { - super(context, AstralAdditionsClient.MODEL_VOIDTOUCHED_SKELETON_LAYER, EntityModelLayers.SKELETON_INNER_ARMOR, EntityModelLayers.SKELETON_OUTER_ARMOR); + super(context, ModEntityModelLayer.MODEL_VOIDTOUCHED_SKELETON_LAYER, EntityModelLayers.SKELETON_INNER_ARMOR, EntityModelLayers.SKELETON_OUTER_ARMOR); } @Override diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedzombie/VoidtouchedZombieEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedzombie/VoidtouchedZombieEntity.java index 89d3a67..f080c1a 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedzombie/VoidtouchedZombieEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedzombie/VoidtouchedZombieEntity.java @@ -13,7 +13,6 @@ import net.minecraft.entity.mob.ZombieEntity; import net.minecraft.item.ItemStack; import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ServerWorldAccess; @@ -32,7 +31,11 @@ public static boolean canSpawn(EntityType type, ServerW } public static DefaultAttributeContainer.Builder createVoidtouchedZombieAttributes() { - return HostileEntity.createHostileAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 30.0).add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.28f).add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 5.0).add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0).add(EntityAttributes.ZOMBIE_SPAWN_REINFORCEMENTS, 0.0f); + return HostileEntity.createHostileAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 30.0) + .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.28f) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 5.0) + .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0) + .add(EntityAttributes.ZOMBIE_SPAWN_REINFORCEMENTS, 0.0f); } @Override @@ -68,4 +71,4 @@ protected void updatePostDeath() { } super.updatePostDeath(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedzombie/VoidtouchedZombieEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedzombie/VoidtouchedZombieEntityRenderer.java index 6656c9e..93329fb 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedzombie/VoidtouchedZombieEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/voidtouchedzombie/VoidtouchedZombieEntityRenderer.java @@ -1,8 +1,7 @@ package com.github.ethanicuss.astraladditions.entities.voidtouchedzombie; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.AstralAdditionsClient; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntityModelLayer; import net.minecraft.client.model.Dilation; import net.minecraft.client.model.TexturedModelData; import net.minecraft.client.render.entity.EntityRendererFactory; @@ -19,7 +18,7 @@ public class VoidtouchedZombieEntityRenderer private static final Identifier TEXTURE = new Identifier(AstralAdditions.MOD_ID, "textures/entity/voidtouched_zombie/zombie.png"); public VoidtouchedZombieEntityRenderer(EntityRendererFactory.Context context) { - super(context, AstralAdditionsClient.MODEL_VOIDTOUCHED_ZOMBIE_LAYER, EntityModelLayers.HUSK_INNER_ARMOR, EntityModelLayers.HUSK_OUTER_ARMOR); + super(context, ModEntityModelLayer.MODEL_VOIDTOUCHED_ZOMBIE_LAYER, EntityModelLayers.HUSK_INNER_ARMOR, EntityModelLayers.HUSK_OUTER_ARMOR); } public static TexturedModelData getTexturedModelData(){ @@ -37,4 +36,4 @@ protected void scale(ZombieEntity zombieEntity, MatrixStack matrixStack, float f public Identifier getTexture(ZombieEntity zombieEntity) { return TEXTURE; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/whast/WhastEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/whast/WhastEntity.java index f3296e9..d7aacba 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/whast/WhastEntity.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/whast/WhastEntity.java @@ -14,7 +14,6 @@ import net.minecraft.entity.mob.GhastEntity; import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.FireballEntity; import net.minecraft.entity.projectile.WitherSkullEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; @@ -22,7 +21,6 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldEvents; -import net.minecraft.world.explosion.Explosion; import java.util.EnumSet; import java.util.Random; @@ -51,7 +49,9 @@ public int getFireballStrength() { } public static DefaultAttributeContainer.Builder createWhastAttributes() { - return MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 25.0).add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0); + return MobEntity.createMobAttributes() + .add(EntityAttributes.GENERIC_MAX_HEALTH, 25.0) + .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0); } @Override @@ -240,4 +240,4 @@ public void tick() { } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/whast/WhastEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/whast/WhastEntityRenderer.java index dd752ba..fc2a3c6 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/whast/WhastEntityRenderer.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/entities/whast/WhastEntityRenderer.java @@ -1,7 +1,6 @@ package com.github.ethanicuss.astraladditions.entities.whast; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.phast.PhastEntity; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.entity.EntityRendererFactory; @@ -10,7 +9,6 @@ import net.minecraft.client.render.entity.model.GhastEntityModel; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; @Environment(value= EnvType.CLIENT) public class WhastEntityRenderer diff --git a/src/main/java/com/github/ethanicuss/astraladditions/fluids/ModFluid.java b/src/main/java/com/github/ethanicuss/astraladditions/fluids/ModFlowableFluid.java similarity index 98% rename from src/main/java/com/github/ethanicuss/astraladditions/fluids/ModFluid.java rename to src/main/java/com/github/ethanicuss/astraladditions/fluids/ModFlowableFluid.java index ecd70d2..e8abaf8 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/fluids/ModFluid.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/fluids/ModFlowableFluid.java @@ -23,7 +23,7 @@ import java.util.Random; -public abstract class ModFluid extends FlowableFluid { +public abstract class ModFlowableFluid extends FlowableFluid { /** * @return whether the given fluid an instance of this fluid @@ -132,4 +132,4 @@ protected void flow(WorldAccess world, BlockPos pos, BlockState state, Direction super.flow(world, pos, state, direction, fluidState); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/fluids/ShimmerFluid.java b/src/main/java/com/github/ethanicuss/astraladditions/fluids/ShimmerFluid.java index d3c40d2..5dbca9f 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/fluids/ShimmerFluid.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/fluids/ShimmerFluid.java @@ -1,5 +1,6 @@ package com.github.ethanicuss.astraladditions.fluids; +import com.github.ethanicuss.astraladditions.registry.ModFluids; import net.minecraft.block.BlockState; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; @@ -7,7 +8,7 @@ import net.minecraft.state.StateManager; import net.minecraft.state.property.Properties; -public abstract class ShimmerFluid extends ModFluid { +public abstract class ShimmerFluid extends ModFlowableFluid { @Override public Fluid getStill() { return ModFluids.STILL_SHIMMER; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/fluids/SputumFlowableFluid.java b/src/main/java/com/github/ethanicuss/astraladditions/fluids/SputumFlowableFluid.java index 7e111c9..afac849 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/fluids/SputumFlowableFluid.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/fluids/SputumFlowableFluid.java @@ -1,7 +1,6 @@ package com.github.ethanicuss.astraladditions.fluids; import com.github.ethanicuss.astraladditions.registry.ModBlocks; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.FluidBlock; @@ -143,4 +142,4 @@ protected void flow(WorldAccess world, BlockPos pos, BlockState state, Direction super.flow(world, pos, state, direction, fluidState); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/fluids/SputumFluid.java b/src/main/java/com/github/ethanicuss/astraladditions/fluids/SputumFluid.java index 6c792a3..0485a29 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/fluids/SputumFluid.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/fluids/SputumFluid.java @@ -1,5 +1,6 @@ package com.github.ethanicuss.astraladditions.fluids; +import com.github.ethanicuss.astraladditions.registry.ModFluids; import net.minecraft.block.BlockState; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/BoomerangItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/BoomerangItem.java index ccd6121..6cdee5d 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/BoomerangItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/BoomerangItem.java @@ -1,15 +1,12 @@ package com.github.ethanicuss.astraladditions.items; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.boomerang.BoomerangEntity; -import com.github.ethanicuss.astraladditions.entities.cometball.CometballEntity; import net.minecraft.client.item.TooltipContext; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; -import net.minecraft.particle.ParticleTypes; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.stat.Stats; @@ -17,15 +14,11 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Hand; -import net.minecraft.util.StringHelper; import net.minecraft.util.TypedActionResult; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import java.util.List; -import java.util.Objects; public class BoomerangItem extends Item { diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/CogflySpawnItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/CogflySpawnItem.java index d813aab..9b176ad 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/CogflySpawnItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/CogflySpawnItem.java @@ -1,7 +1,8 @@ package com.github.ethanicuss.astraladditions.items; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.cogfly.CogflyEntity; +import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.EntityType; import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.player.PlayerEntity; @@ -9,10 +10,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SpawnEggItem; import net.minecraft.stat.Stats; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; +import java.util.List; import java.util.UUID; public class CogflySpawnItem extends Item { @@ -38,5 +43,8 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han return TypedActionResult.success(itemStack, world.isClient()); } -} - + @Override + public void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context) { + tooltip.add(new TranslatableText("tooltip.astraladditions.cogfly").formatted(Formatting.GRAY)); + } +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/CosmicHourglassItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/CosmicHourglassItem.java index 19dc04a..80a34ac 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/CosmicHourglassItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/CosmicHourglassItem.java @@ -1,32 +1,21 @@ package com.github.ethanicuss.astraladditions.items; -import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import com.github.ethanicuss.astraladditions.entities.pylon.PylonEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; import net.minecraft.particle.ParticleTypes; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.stat.Stats; import net.minecraft.util.Hand; -import net.minecraft.util.TypeFilter; import net.minecraft.util.TypedActionResult; -import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import java.util.EnumSet; -import java.util.List; - public class CosmicHourglassItem extends Item { public CosmicHourglassItem(Settings settings) { @@ -93,4 +82,4 @@ public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/FragileItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/FragileItem.java index 87fd682..580a164 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/FragileItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/FragileItem.java @@ -2,11 +2,9 @@ import com.github.ethanicuss.astraladditions.util.ModUtils; import net.minecraft.entity.Entity; -import net.minecraft.entity.ai.brain.task.LookTargetUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.loot.LootTable; import net.minecraft.loot.context.LootContext; import net.minecraft.loot.context.LootContextParameters; @@ -14,8 +12,6 @@ import net.minecraft.particle.ParticleTypes; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundEvents; -import net.minecraft.tag.TagKey; -import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -52,4 +48,4 @@ public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, entity.playSound(SoundEvents.ENTITY_ITEM_BREAK, 1.1f, 0.9f); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/OHNOBrokenItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/OHNOBrokenItem.java index c6653c4..384cb7d 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/OHNOBrokenItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/OHNOBrokenItem.java @@ -1,10 +1,7 @@ package com.github.ethanicuss.astraladditions.items; -import com.github.ethanicuss.astraladditions.registry.ModItems; import com.github.ethanicuss.astraladditions.util.ModUtils; -import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; @@ -12,17 +9,8 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; -import net.minecraft.stat.Stats; -import net.minecraft.text.LiteralText; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import net.minecraft.util.Hand; -import net.minecraft.util.StringHelper; -import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; -import java.util.List; public class OHNOBrokenItem extends Item {//Orbital Homeward Navigation Orb - O.H-N.O @@ -45,4 +33,4 @@ public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, } } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/OHNOItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/OHNOItem.java index d5c7875..3fcb4fb 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/OHNOItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/OHNOItem.java @@ -1,23 +1,16 @@ package com.github.ethanicuss.astraladditions.items; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import com.github.ethanicuss.astraladditions.entities.pylon.PylonEntity; import com.github.ethanicuss.astraladditions.registry.ModItems; import net.fabricmc.fabric.api.dimension.v1.FabricDimensions; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.item.TooltipContext; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; -import net.minecraft.particle.ParticleTypes; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; @@ -25,9 +18,7 @@ import net.minecraft.stat.Stats; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.*; -import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3d; import net.minecraft.world.TeleportTarget; import net.minecraft.world.World; @@ -108,4 +99,4 @@ public void appendTooltip(ItemStack itemStack, @Nullable World world, List } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/PylonItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/PylonItem.java index ebf4ba1..7c3b369 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/PylonItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/PylonItem.java @@ -1,20 +1,12 @@ package com.github.ethanicuss.astraladditions.items; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import com.github.ethanicuss.astraladditions.entities.cometball.CometballEntity; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.pylon.PylonEntity; -import com.github.ethanicuss.astraladditions.entities.shimmerblaze.ShimmerBlazeEntity; -import com.github.ethanicuss.astraladditions.registry.ModItems; import com.github.ethanicuss.astraladditions.util.ModUtils; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.damage.DamageSource; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -31,12 +23,8 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.*; import net.minecraft.util.math.Box; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import org.apache.logging.log4j.core.jmx.Server; import org.jetbrains.annotations.Nullable; -import org.lwjgl.system.CallbackI; import java.util.EnumSet; import java.util.List; @@ -192,99 +180,6 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han private double getDistance(double x1, double y1, double z1, double x2, double y2, double z2){ return Math.sqrt(Math.pow(x1-x2, 2) + Math.pow(y1-y2, 2) + Math.pow(z1-z2, 2)); } - /* - @Override - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { - ItemStack itemStack = user.getStackInHand(hand); - world.playSound(null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.NEUTRAL, 0.5f, 0.3f / (world.getRandom().nextFloat() * 0.4f + 0.8f)); - if (world.isClient()) { - } else { - double i = user.getX(); - double j = user.getY(); - double k = user.getZ(); - float f = 128.0f; - Box box = new Box((float) i - f, (float) j - f, (float) k - f, (float) (i + 1) + f, (float) (j + 1) + f, (float) (k + 1) + f); - List pylons = user.world.getEntitiesByType(TypeFilter.instanceOf(PylonEntity.class), box, pylonEntity -> PylonEntity.isOwner(pylonEntity, user.getEntityName())); - if (!pylons.isEmpty()) { - PylonEntity pylon = pylons.get(0); - if (!user.isSneaking()) { - for (int amount = 0; amount < 10; amount++) { - MinecraftClient.getInstance().world.addParticle(ParticleTypes.GLOW_SQUID_INK, user.getX(), user.getY(), user.getZ(), 0.0 + world.getRandom().nextFloat() * 0.2f - 0.1f, 0.3 + world.getRandom().nextFloat() * 0.7f, 0.0 + world.getRandom().nextFloat() * 0.2f - 0.1f); - MinecraftClient.getInstance().world.addParticle(ParticleTypes.GLOW_SQUID_INK, pylon.getX(), pylon.getY(), pylon.getZ(), 0.0 + world.getRandom().nextFloat() * 0.2f - 0.1f, 0.3 + world.getRandom().nextFloat() * 0.7f, 0.0 + world.getRandom().nextFloat() * 0.2f - 0.1f); - MinecraftClient.getInstance().world.addParticle(ParticleTypes.WITCH, user.getX(), user.getY(), user.getZ(), 0.0 + world.getRandom().nextFloat() * 0.8f - 0.4f, 0.4 + world.getRandom().nextFloat() * 0.3f, 0.0 + world.getRandom().nextFloat() * 0.8f - 0.4f); - MinecraftClient.getInstance().world.addParticle(ParticleTypes.WITCH, pylon.getX(), pylon.getY(), pylon.getZ(), 0.0 + world.getRandom().nextFloat() * 0.8f - 0.4f, 0.4 + world.getRandom().nextFloat() * 0.3f, 0.0 + world.getRandom().nextFloat() * 0.8f - 0.4f); - } - ((ServerPlayerEntity) user).networkHandler.requestTeleport(pylon.getX(), pylon.getY(), pylon.getZ(), user.getYaw(), user.getPitch(), EnumSet.noneOf(PlayerPositionLookS2CPacket.Flag.class)); - MinecraftClient.getInstance().player.setVelocity(0.0f, 0.5f, 0.0f); - world.playSound(null, user.getX(), user.getY(), user.getZ(), SoundEvents.AMBIENT_UNDERWATER_ENTER, SoundCategory.NEUTRAL, 0.7f, 0.8f / (world.getRandom().nextFloat() * 0.4f + 0.8f)); - world.playSound(null, pylon.getX(), pylon.getY(), pylon.getZ(), SoundEvents.AMBIENT_UNDERWATER_ENTER, SoundCategory.NEUTRAL, 0.7f, 0.8f / (world.getRandom().nextFloat() * 0.4f + 0.8f)); - } - else{ - for (int amount = 0; amount < 45; amount++) { - MinecraftClient.getInstance().world.addParticle(ParticleTypes.GLOW_SQUID_INK, pylon.getX(), pylon.getY() + 0.2f, pylon.getZ(), Math.sin(amount*8.0f)*1.2f, 0, Math.cos(amount*8.0f)*1.2f); - MinecraftClient.getInstance().world.addParticle(ParticleTypes.SQUID_INK, pylon.getX(), pylon.getY() + 1.2f, pylon.getZ(), Math.sin(amount*8.0f)*1.4f, 0, Math.cos(amount*8.0f)*1.4f); - MinecraftClient.getInstance().world.addParticle(ParticleTypes.GLOW_SQUID_INK, pylon.getX(), pylon.getY() + 2.2f, pylon.getZ(), Math.sin(amount*8.0f)*1.2f, 0, Math.cos(amount*8.0f)*1.2f); - } - world.playSound(null, pylon.getX(), pylon.getY(), pylon.getZ(), SoundEvents.BLOCK_BELL_USE, SoundCategory.NEUTRAL, 0.5f, 1.5f); - float strength = -0.16f; - float vStrength = 0.05f; - List pl = world.getOtherEntities(pylon, new Box(pylon.getX()-16, pylon.getY()-32, pylon.getZ()-16, pylon.getX()+16, pylon.getY()+32, pylon.getZ()+16)); - pl.add(MinecraftClient.getInstance().player); - for (Entity p : pl) { - if (p instanceof LivingEntity){ - int strMult = 1; - if (!(p instanceof PlayerEntity)) { - strMult *= 2; - } - double xdiff = pylon.getX() - p.getX(); - double zdiff = pylon.getZ() - p.getZ(); - double dist = Math.sqrt(Math.pow(xdiff, 2) + Math.pow(zdiff, 2)); - if (dist < 10) { - if (xdiff == 0) { - xdiff = 0.01; - } - if (zdiff == 0) { - zdiff = 0.01; - } - double angleX = Math.atan(Math.abs(zdiff) / xdiff); - double angleZ = Math.atan(Math.abs(xdiff) / zdiff); - double cosX = Math.cos(angleX); - double cosZ = Math.cos(angleZ); - if (cosX == 0) { - cosX = 0.01; - } - if (cosZ == 0) { - cosZ = 0.01; - } - dist = -dist + 10; - p.addVelocity(dist * cosX * strength * strMult * (Math.abs(angleX) / angleX), Math.abs(dist * vStrength * strMult), dist * cosZ * strength * strMult * (Math.abs(angleZ) / angleZ)); - } - } - } - } - - pylon.discard(); - } else { - world.playSound(null, user.getX(), user.getY(), user.getZ(), SoundEvents.AMBIENT_UNDERWATER_EXIT, SoundCategory.NEUTRAL, 0.7f, 0.8f / (world.getRandom().nextFloat() * 0.4f + 0.8f)); - for (int amount = 0; amount < 5; amount++) { - MinecraftClient.getInstance().world.addParticle(ParticleTypes.WITCH, user.getX(), user.getY(), user.getZ(), 0.0 + world.getRandom().nextFloat() * 0.4f - 0.2f, 0.2 + world.getRandom().nextFloat() * 0.2f, 0.0 + world.getRandom().nextFloat() * 0.4f - 0.2f); - } - for (int amount = 0; amount < 45; amount++) { - MinecraftClient.getInstance().world.addParticle(ParticleTypes.GLOW_SQUID_INK, user.getX(), user.getY() + 0.2f, user.getZ(), Math.sin(amount*8.0f)*1.0f, 0, Math.cos(amount*8.0f)*1.0f); - } - PylonEntity pylon = new PylonEntity(ModEntities.PYLON, user.world); - pylon.setPlayer(user.getEntityName()); - pylon.setPos(user.getX(), user.getY() + 1, user.getZ()); - pylon.refreshPositionAndAngles(user.getX(), user.getY() + 1, user.getZ(), 0, 0); - world.spawnEntity(pylon); - } - } - user.getItemCooldownManager().set(this, 60); - user.incrementStat(Stats.USED.getOrCreateStat(this)); - return TypedActionResult.success(itemStack, world.isClient()); - } - - */ @Override public void appendTooltip(ItemStack itemStack, @Nullable World world, List tooltip, TooltipContext context) { @@ -298,4 +193,4 @@ public void appendTooltip(ItemStack itemStack, @Nullable World world, List } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/ShimmerBottleItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/ShimmerBottleItem.java index 52a177e..f8c5e28 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/ShimmerBottleItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/ShimmerBottleItem.java @@ -1,21 +1,16 @@ package com.github.ethanicuss.astraladditions.items; import com.github.ethanicuss.astraladditions.AstralAdditions; -import net.minecraft.advancement.criterion.Criteria; import net.minecraft.client.item.TooltipContext; -import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.*; -import net.minecraft.potion.PotionUtil; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; -import net.minecraft.stat.Stats; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; @@ -23,9 +18,7 @@ import net.minecraft.util.TypedActionResult; import net.minecraft.util.UseAction; import net.minecraft.world.World; -import net.minecraft.world.event.GameEvent; import org.jetbrains.annotations.Nullable; -import org.lwjgl.system.CallbackI; import java.util.List; @@ -75,4 +68,4 @@ public SoundEvent getEatSound() { public TypedActionResult use(World world, PlayerEntity user, Hand hand) { return ItemUsage.consumeHeldItem(world, user, hand); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/AstralHoeItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/tools/AstralHoeItem.java similarity index 93% rename from src/main/java/com/github/ethanicuss/astraladditions/items/AstralHoeItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/tools/AstralHoeItem.java index 32bc603..e38389f 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/AstralHoeItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/tools/AstralHoeItem.java @@ -1,9 +1,6 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.tools; -import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import com.github.ethanicuss.astraladditions.entities.cometball.CometballEntity; -import com.github.ethanicuss.astraladditions.entities.pylon.PylonEntity; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.shimmerblaze.ShimmerBlazeRainEntity; import com.github.ethanicuss.astraladditions.util.ModUtils; import com.google.common.collect.ImmutableMap; @@ -11,7 +8,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.mojang.datafixers.util.Pair; -import net.fabricmc.yarn.constants.MiningLevels; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -25,16 +21,13 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.*; import net.minecraft.particle.ParticleTypes; -import net.minecraft.recipe.Ingredient; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.ActionResult; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; import net.minecraft.world.World; -import java.util.List; import java.util.Map; import java.util.function.Consumer; import java.util.function.Predicate; @@ -125,4 +118,4 @@ public ActionResult useOnBlock(ItemUsageContext context) { } return ActionResult.PASS; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/ChromaticVacuumItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/tools/ChromaticVacuumItem.java similarity index 95% rename from src/main/java/com/github/ethanicuss/astraladditions/items/ChromaticVacuumItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/tools/ChromaticVacuumItem.java index b927a82..653d513 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/ChromaticVacuumItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/tools/ChromaticVacuumItem.java @@ -1,6 +1,6 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.tools; -import com.github.ethanicuss.astraladditions.registry.ChromaticVacuumRecipe; +import com.github.ethanicuss.astraladditions.recipes.ChromaticVacuumRecipe; import com.github.ethanicuss.astraladditions.util.ModUtils; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -15,7 +15,6 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; -import net.minecraft.stat.Stats; import net.minecraft.util.ActionResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -81,4 +80,4 @@ public ActionResult useOnBlock(ItemUsageContext context) { return ActionResult.SUCCESS; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/ShimmerBlowerItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/tools/ShimmerBlowerItem.java similarity index 98% rename from src/main/java/com/github/ethanicuss/astraladditions/items/ShimmerBlowerItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/tools/ShimmerBlowerItem.java index c0e5ddc..8794bb5 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/ShimmerBlowerItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/tools/ShimmerBlowerItem.java @@ -1,6 +1,6 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.tools; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.shimmerblaze.SmallShimmerballEntity; import com.github.ethanicuss.astraladditions.util.ModUtils; import com.google.common.collect.ImmutableMultimap; @@ -204,4 +204,4 @@ public void appendTooltip(ItemStack itemStack, @Nullable World world, List } } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/ShimmerFishingRodItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/tools/ShimmerFishingRodItem.java similarity index 96% rename from src/main/java/com/github/ethanicuss/astraladditions/items/ShimmerFishingRodItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/tools/ShimmerFishingRodItem.java index 531b11c..e53527e 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/ShimmerFishingRodItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/tools/ShimmerFishingRodItem.java @@ -1,4 +1,4 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.tools; import com.github.ethanicuss.astraladditions.entities.shimmerfishingrod.ShimmerFishingBobberEntity; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/CometballItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/CometballItem.java similarity index 91% rename from src/main/java/com/github/ethanicuss/astraladditions/items/CometballItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/weapons/CometballItem.java index 938b639..0d24ae4 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/CometballItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/CometballItem.java @@ -1,12 +1,9 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.weapons; -import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.cometball.CometballEntity; -import net.minecraft.entity.Entity; import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.thrown.SnowballEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.particle.ParticleTypes; @@ -61,4 +58,4 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han } return TypedActionResult.success(itemStack, world.isClient()); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/EGuitarItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/EGuitarItem.java similarity index 94% rename from src/main/java/com/github/ethanicuss/astraladditions/items/EGuitarItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/weapons/EGuitarItem.java index 328378c..483722c 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/EGuitarItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/EGuitarItem.java @@ -1,8 +1,5 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.weapons; -import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import com.github.ethanicuss.astraladditions.entities.meteor_mitts.MeteorPunchEntity; import com.github.ethanicuss.astraladditions.registry.ModSounds; import com.github.ethanicuss.astraladditions.util.ModUtils; import com.google.common.collect.ImmutableMultimap; @@ -16,19 +13,14 @@ import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.boss.dragon.EnderDragonEntity; import net.minecraft.entity.damage.DamageSource; -import net.minecraft.entity.damage.EntityDamageSource; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.particle.ParticleTypes; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.ServerTask; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; -import net.minecraft.sound.SoundEvents; import net.minecraft.stat.Stats; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; @@ -154,4 +146,4 @@ public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos return true; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/LunarWackerItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/LunarWackerItem.java similarity index 97% rename from src/main/java/com/github/ethanicuss/astraladditions/items/LunarWackerItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/weapons/LunarWackerItem.java index be4f0ef..0d099d4 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/LunarWackerItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/LunarWackerItem.java @@ -1,4 +1,4 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.weapons; import com.github.ethanicuss.astraladditions.util.ModUtils; import com.google.common.collect.ImmutableMultimap; @@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.particle.ParticleTypes; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; @@ -102,4 +101,4 @@ public void appendTooltip(ItemStack itemStack, @Nullable World world, List } } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/MachinegunItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/MachinegunItem.java similarity index 98% rename from src/main/java/com/github/ethanicuss/astraladditions/items/MachinegunItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/weapons/MachinegunItem.java index eb1af92..38b26ae 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/MachinegunItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/MachinegunItem.java @@ -1,4 +1,4 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.weapons; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.LivingEntity; @@ -88,4 +88,4 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han } return TypedActionResult.fail(itemStack); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/MeteorMittsItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/MeteorMittsItem.java similarity index 87% rename from src/main/java/com/github/ethanicuss/astraladditions/items/MeteorMittsItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/weapons/MeteorMittsItem.java index 72faa84..a129a62 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/MeteorMittsItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/MeteorMittsItem.java @@ -1,40 +1,27 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.weapons; -import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import com.github.ethanicuss.astraladditions.entities.cometball.CometballEntity; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.meteor_mitts.MeteorPunchEntity; -import com.github.ethanicuss.astraladditions.entities.pylon.PylonEntity; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import net.minecraft.block.BlockState; -import net.minecraft.client.MinecraftClient; -import net.minecraft.entity.Entity; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.attribute.EntityAttribute; import net.minecraft.entity.attribute.EntityAttributeModifier; import net.minecraft.entity.attribute.EntityAttributes; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; import net.minecraft.particle.ParticleTypes; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.stat.Stats; import net.minecraft.util.Hand; -import net.minecraft.util.TypeFilter; import net.minecraft.util.TypedActionResult; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; import net.minecraft.world.World; -import java.util.EnumSet; -import java.util.List; - public class MeteorMittsItem extends Item { private final Multimap attributeModifiers; @@ -102,4 +89,4 @@ public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos return true; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/ShotgunItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/ShotgunItem.java similarity index 91% rename from src/main/java/com/github/ethanicuss/astraladditions/items/ShotgunItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/weapons/ShotgunItem.java index a3f31db..171b566 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/ShotgunItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/ShotgunItem.java @@ -1,14 +1,10 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.weapons; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.scrap_projectile.ScrapProjectileEntity; -import com.github.ethanicuss.astraladditions.entities.scrap_projectile.ScrapProjectileEntityRenderer; import net.minecraft.client.MinecraftClient; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ArrowItem; import net.minecraft.item.BowItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -93,4 +89,4 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han } return TypedActionResult.fail(itemStack); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/SoulstealDaggerItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/SoulstealDaggerItem.java similarity index 98% rename from src/main/java/com/github/ethanicuss/astraladditions/items/SoulstealDaggerItem.java rename to src/main/java/com/github/ethanicuss/astraladditions/items/weapons/SoulstealDaggerItem.java index 6472d58..fe4b79c 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/items/SoulstealDaggerItem.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/items/weapons/SoulstealDaggerItem.java @@ -1,4 +1,4 @@ -package com.github.ethanicuss.astraladditions.items; +package com.github.ethanicuss.astraladditions.items.weapons; import com.github.ethanicuss.astraladditions.util.ModUtils; import com.google.common.collect.ImmutableMultimap; @@ -102,4 +102,4 @@ public void appendTooltip(ItemStack itemStack, @Nullable World world, List } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/mixin/InGameHudMixin.java b/src/main/java/com/github/ethanicuss/astraladditions/mixin/InGameHudMixin.java new file mode 100644 index 0000000..5d2f1da --- /dev/null +++ b/src/main/java/com/github/ethanicuss/astraladditions/mixin/InGameHudMixin.java @@ -0,0 +1,54 @@ +package com.github.ethanicuss.astraladditions.mixin; + +import com.github.ethanicuss.astraladditions.AstralAdditions; +import com.github.ethanicuss.astraladditions.registry.ModData; +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(InGameHud.class) +public abstract class InGameHudMixin { + @Shadow @Final private MinecraftClient client; + + private static final Identifier shimmerBubbleTexture = new Identifier(AstralAdditions.MOD_ID, "textures/gui/shimmer_air_bubbles.png"); + + private static boolean isBubbleQuad(int u, int v, int w, int h) { + return w == 9 && h == 9 && v == 18 && (u == 16 || u == 25); + } + + private boolean isEyeInShimmer(PlayerEntity player) { + if (player == null) return false; + Vec3d eye = player.getCameraPosVec(1.0f).add(0, -0.5, 0); + BlockPos pos = new BlockPos(eye.x, eye.y, eye.z); + return player.world.getFluidState(pos).isIn(ModData.SHIMMER_TAG); + } + + @Redirect(method = "renderStatusBars", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/client/gui/hud/InGameHud;drawTexture(Lnet/minecraft/client/util/math/MatrixStack;IIIIII)V"), + require = 0 + ) + private void renderShimmerBubbles(InGameHud self, MatrixStack m, int x, int y, int u, int v, int w, int h) { + if (isEyeInShimmer(client.player) && isBubbleQuad(u, v, w, h)) { + RenderSystem.setShaderTexture(0, shimmerBubbleTexture); + self.drawTexture(m, x, y, u, v, w, h); + RenderSystem.setShaderTexture(0, DrawableHelper.GUI_ICONS_TEXTURE); + } else { + self.drawTexture(m, x, y, u, v, w, h); + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/mixin/ItemEntityMixin.java b/src/main/java/com/github/ethanicuss/astraladditions/mixin/ItemEntityMixin.java index 515062e..25647e8 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/mixin/ItemEntityMixin.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/mixin/ItemEntityMixin.java @@ -1,8 +1,8 @@ package com.github.ethanicuss.astraladditions.mixin; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.shimmerblaze.ShimmerBlazeEntity; -import com.github.ethanicuss.astraladditions.fluids.ModFluids; +import com.github.ethanicuss.astraladditions.registry.ModFluids; import com.github.ethanicuss.astraladditions.recipes.TransmuteRecipe; import com.github.ethanicuss.astraladditions.registry.ModData; import com.github.ethanicuss.astraladditions.registry.ModItems; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/mixin/ParticleRecolourMixin.java b/src/main/java/com/github/ethanicuss/astraladditions/mixin/ParticleRecolourMixin.java index dd12c0e..b4de3d4 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/mixin/ParticleRecolourMixin.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/mixin/ParticleRecolourMixin.java @@ -1,18 +1,13 @@ package com.github.ethanicuss.astraladditions.mixin; -import com.github.ethanicuss.astraladditions.fluids.ModFluids; -import com.github.ethanicuss.astraladditions.particle.ModParticles; +import com.github.ethanicuss.astraladditions.registry.ModFluids; +import com.github.ethanicuss.astraladditions.registry.ModParticles; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.world.ClientWorld; import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.FluidState; -import net.minecraft.particle.DefaultParticleType; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleType; import net.minecraft.particle.ParticleTypes; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/mixin/ShimmerEffect.java b/src/main/java/com/github/ethanicuss/astraladditions/mixin/ShimmerEffectMixin.java similarity index 92% rename from src/main/java/com/github/ethanicuss/astraladditions/mixin/ShimmerEffect.java rename to src/main/java/com/github/ethanicuss/astraladditions/mixin/ShimmerEffectMixin.java index f49f8ed..93e7c96 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/mixin/ShimmerEffect.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/mixin/ShimmerEffectMixin.java @@ -1,8 +1,7 @@ package com.github.ethanicuss.astraladditions.mixin; -import com.github.ethanicuss.astraladditions.registry.ModEffects; import it.unimi.dsi.fastutil.objects.Object2DoubleMap; -import com.github.ethanicuss.astraladditions.fluids.ModFluids; +import com.github.ethanicuss.astraladditions.registry.ModFluids; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -20,7 +19,7 @@ @Mixin(Entity.class) -public class ShimmerEffect { +public class ShimmerEffectMixin { @Inject(method = "baseTick", at = @At("HEAD")) public void baseTick(CallbackInfo ci) { @@ -42,4 +41,4 @@ public void baseTick(CallbackInfo ci) { } } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/mixin/SpaceMusic.java b/src/main/java/com/github/ethanicuss/astraladditions/mixin/SpaceMusicMixin.java similarity index 96% rename from src/main/java/com/github/ethanicuss/astraladditions/mixin/SpaceMusic.java rename to src/main/java/com/github/ethanicuss/astraladditions/mixin/SpaceMusicMixin.java index 2bf992b..6935c14 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/mixin/SpaceMusic.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/mixin/SpaceMusicMixin.java @@ -13,11 +13,11 @@ import org.spongepowered.asm.mixin.injection.callback.LocalCapture; @Mixin(MinecraftClient.class) -public class SpaceMusic { +public class SpaceMusicMixin { @Shadow public boolean wireFrame; @Shadow @Final private MusicTracker musicTracker; @Inject(method = "getMusicType", at = @At("HEAD"), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true) private void getMusicType(CallbackInfoReturnable cir){ cir.setReturnValue(MusicPlayer.findMusic(musicTracker)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/BetterDragon.java b/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/BetterDragon.java index b096508..6362d11 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/BetterDragon.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/BetterDragon.java @@ -1,6 +1,6 @@ package com.github.ethanicuss.astraladditions.mixin.betterdragon; -import com.github.ethanicuss.astraladditions.entities.ModEntities; +import com.github.ethanicuss.astraladditions.registry.ModEntities; import com.github.ethanicuss.astraladditions.entities.moondragon.EnderBallEntity; import com.github.ethanicuss.astraladditions.entities.moondragon.GluttonyBallEntity; import com.github.ethanicuss.astraladditions.entities.voidtouchedzombie.VoidtouchedZombieEntity; @@ -294,5 +294,4 @@ public void beginPhase(CallbackInfo ci) { } } } -} - +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/DragonAccessor.java b/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/DragonAccessor.java index 789475a..2f8229a 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/DragonAccessor.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/DragonAccessor.java @@ -2,7 +2,6 @@ import net.minecraft.entity.boss.dragon.EnderDragonEntity; import net.minecraft.entity.boss.dragon.EnderDragonPart; -import net.minecraft.entity.boss.dragon.phase.AbstractPhase; import net.minecraft.entity.boss.dragon.phase.PhaseManager; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -14,4 +13,4 @@ public interface DragonAccessor { @Accessor PhaseManager getPhaseManager(); -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/PhaseAccessor.java b/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/PhaseAccessor.java index 6f2d0d6..ad31ae7 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/PhaseAccessor.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/mixin/betterdragon/PhaseAccessor.java @@ -1,15 +1,11 @@ package com.github.ethanicuss.astraladditions.mixin.betterdragon; -import net.minecraft.entity.ai.TargetPredicate; -import net.minecraft.entity.ai.pathing.Path; -import net.minecraft.entity.boss.dragon.phase.HoldingPatternPhase; import net.minecraft.entity.boss.dragon.phase.HoverPhase; import net.minecraft.entity.boss.dragon.phase.LandingPhase; import net.minecraft.entity.boss.dragon.phase.SittingFlamingPhase; import net.minecraft.util.math.Vec3d; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(LandingPhase.class) interface LandingPhaseAccessor { @@ -36,4 +32,4 @@ interface SittingFlamingPhaseAccessor { @Accessor int getTimesRun(); -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/mixin/fishing/FishingBobberEntityMixin.java b/src/main/java/com/github/ethanicuss/astraladditions/mixin/fishing/FishingBobberEntityMixin.java index 286a25f..734ef8f 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/mixin/fishing/FishingBobberEntityMixin.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/mixin/fishing/FishingBobberEntityMixin.java @@ -1,7 +1,7 @@ package com.github.ethanicuss.astraladditions.mixin.fishing; import com.github.ethanicuss.astraladditions.entities.shimmerfishingrod.ShimmerFishingBobberEntity; -import com.github.ethanicuss.astraladditions.fluids.ModFluids; +import com.github.ethanicuss.astraladditions.registry.ModFluids; import net.minecraft.entity.projectile.FishingBobberEntity; import net.minecraft.fluid.FluidState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/particle/ModParticlesClient.java b/src/main/java/com/github/ethanicuss/astraladditions/particle/ModParticlesClient.java deleted file mode 100644 index f2a38dc..0000000 --- a/src/main/java/com/github/ethanicuss/astraladditions/particle/ModParticlesClient.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.ethanicuss.astraladditions.particle; - -import com.github.ethanicuss.astraladditions.particle.shimmer.ShimmerBubbleParticle; -import com.github.ethanicuss.astraladditions.particle.shimmer.ShimmerSplashParticle; -import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; - -public class ModParticlesClient { - - public static void registerFactories() { - ParticleFactoryRegistry.getInstance().register(ModParticles.SHIMMER_BUBBLE, ShimmerBubbleParticle.Factory::new); - ParticleFactoryRegistry.getInstance().register(ModParticles.SHIMMER_SPLASH, ShimmerSplashParticle.Factory::new); - } -} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/playertracker/WorldRegister.java b/src/main/java/com/github/ethanicuss/astraladditions/playertracker/WorldRegister.java index c818642..d4241ba 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/playertracker/WorldRegister.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/playertracker/WorldRegister.java @@ -1,8 +1,6 @@ package com.github.ethanicuss.astraladditions.playertracker; -import net.minecraft.client.MinecraftClient; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.integrated.IntegratedServer; import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; @@ -31,4 +29,4 @@ public ServerWorld getWorld(String worldName){ } return null; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ChromaticVacuumRecipe.java b/src/main/java/com/github/ethanicuss/astraladditions/recipes/ChromaticVacuumRecipe.java similarity index 98% rename from src/main/java/com/github/ethanicuss/astraladditions/registry/ChromaticVacuumRecipe.java rename to src/main/java/com/github/ethanicuss/astraladditions/recipes/ChromaticVacuumRecipe.java index b016939..ea88736 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/registry/ChromaticVacuumRecipe.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/recipes/ChromaticVacuumRecipe.java @@ -1,4 +1,4 @@ -package com.github.ethanicuss.astraladditions.registry; +package com.github.ethanicuss.astraladditions.recipes; import com.google.gson.JsonObject; import net.minecraft.inventory.SimpleInventory; @@ -117,4 +117,4 @@ public void write(PacketByteBuf buf, ChromaticVacuumRecipe recipe) { buf.writeItemStack(recipe.getOutput()); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/recipes/DesizerRecipes.java b/src/main/java/com/github/ethanicuss/astraladditions/recipes/DesizerRecipes.java index 90e0d4e..6ead2f1 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/recipes/DesizerRecipes.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/recipes/DesizerRecipes.java @@ -1,24 +1,14 @@ package com.github.ethanicuss.astraladditions.recipes; import com.github.ethanicuss.astraladditions.AstralAdditions; -import net.fabricmc.fabric.impl.registry.sync.FabricRegistry; -import net.fabricmc.fabric.impl.registry.sync.FabricRegistryInit; -import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.Items; -import net.minecraft.recipe.AbstractCookingRecipe; -import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeType; import net.minecraft.tag.*; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryEntryList; -import net.minecraft.util.registry.RegistryKey; -import java.io.File; -import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -118,4 +108,4 @@ public static void init(){ } } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/recipes/TransmuteRecipe.java b/src/main/java/com/github/ethanicuss/astraladditions/recipes/TransmuteRecipe.java index eb6c5b6..19f5e11 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/recipes/TransmuteRecipe.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/recipes/TransmuteRecipe.java @@ -12,8 +12,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; import net.minecraft.world.World; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModBlocks.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModBlocks.java index 7ec0a48..334a840 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModBlocks.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModBlocks.java @@ -2,6 +2,11 @@ import com.github.ethanicuss.astraladditions.AstralAdditions; import com.github.ethanicuss.astraladditions.blocks.*; +import com.github.ethanicuss.astraladditions.blocks.desizer.DesizerCasingBlock; +import com.github.ethanicuss.astraladditions.blocks.desizer.DesizerControllerBlock; +import com.github.ethanicuss.astraladditions.blocks.jar.JarBlock; +import com.github.ethanicuss.astraladditions.blocks.jar.JarBlockEntity; +import com.github.ethanicuss.astraladditions.blocks.jar.JarBlockEntityRenderer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; @@ -9,10 +14,8 @@ import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.block.entity.FurnaceBlockEntity; import net.minecraft.client.render.RenderLayer; import net.minecraft.entity.EntityType; -import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; @@ -32,8 +35,8 @@ private static ToIntFunction createLightLevelFromLitBlockState(int l }; } private static boolean never(BlockState blockState, BlockView blockView, BlockPos blockPos, EntityType entityType) {return false;} - private static boolean never(BlockState blockState, BlockView blockView, BlockPos blockPos) {return false;} + public static final Block MOONSET_CRYSTAL_BLOCK = new Block(FabricBlockSettings.of(Material.AMETHYST).nonOpaque().sounds(BlockSoundGroup.AMETHYST_CLUSTER).strength(2.0f).luminance((state) -> { return 10; })); @@ -75,8 +78,7 @@ private static ToIntFunction createLightLevelFromLitBlockState(int l public static final BlockItem PEARL_POD_ITEM = new BlockItem(PEARL_POD_BLOCK, new FabricItemSettings().group(ItemGroup.DECORATIONS)); public static final Block JAR_BLOCK = new JarBlock(FabricBlockSettings.of(Material.GLASS).sounds(BlockSoundGroup.GLASS).nonOpaque().allowsSpawning(ModBlocks::never).suffocates(ModBlocks::never)); public static final BlockItem JAR_ITEM = new BlockItem(JAR_BLOCK, new FabricItemSettings().group(ItemGroup.DECORATIONS)); - public static final BlockEntityType JAR_BLOCKENTITY = - Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(AstralAdditions.MOD_ID, "jar"), FabricBlockEntityTypeBuilder.create(JarBlockEntity::new, JAR_BLOCK).build()); + public static final BlockEntityType JAR_BLOCKENTITY = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(AstralAdditions.MOD_ID, "jar"), FabricBlockEntityTypeBuilder.create(JarBlockEntity::new, JAR_BLOCK).build()); public static final Block DESIZER_1 = new DesizerCasingBlock(FabricBlockSettings.of(Material.METAL).sounds(BlockSoundGroup.METAL).strength(3.0f)); public static final Block DESIZER_2 = new DesizerCasingBlock(FabricBlockSettings.of(Material.METAL).sounds(BlockSoundGroup.METAL).strength(3.0f)); @@ -100,10 +102,6 @@ private static ToIntFunction createLightLevelFromLitBlockState(int l public static final BlockItem DESIZER_CONTROLLER_ITEM = new BlockItem(DESIZER_CONTROLLER, new FabricItemSettings().group(ItemGroup.BUILDING_BLOCKS)); public static final BlockItem DESIZER_BASE_ITEM = new BlockItem(DESIZER_BASE, new FabricItemSettings().group(ItemGroup.BUILDING_BLOCKS)); - - /*public static final BlockEntityType DESIZER_CONTROLLER_ENTITY = - Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(AstralAdditions.MOD_ID, "desizer_8"), FabricBlockEntityTypeBuilder.create(JarBlockEntity::new, JAR_BLOCK).build()); -*/ public static final Block THE_END_BLOCK = new Block(FabricBlockSettings.of(Material.STONE, MapColor.WHITE).nonOpaque().sounds(BlockSoundGroup.AMETHYST_CLUSTER).requiresTool().strength(50.0f, 1200).luminance((state) -> { return 15; })); @@ -111,55 +109,56 @@ private static ToIntFunction createLightLevelFromLitBlockState(int l public static void registerBlocks() { Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "moonset_crystal_block"), MOONSET_CRYSTAL_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "moonset_crystal_block"), MOONSET_CRYSTAL_BLOCK_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "bulba_root"), BULBA_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "bulba_root"), BULBA_BLOCK_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "lune_shroom"), LUNE_SHROOM_BLOCK); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "potted_lune_shroom"), POTTED_LUNE_SHROOM_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "lune_shroom"), LUNE_SHROOM_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "shimmer_lily"), SHIMMER_LILY_BLOCK); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "potted_shimmer_lily"), POTTED_SHIMMER_LILY_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "shimmer_lily"), SHIMMER_LILY_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "bramblebone"), BRAMBLEBONE_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "bramblebone"), BRAMBLEBONE_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "missing_block"), MISSING_BLOCK); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "prismatic_geyser"), PRISMATIC_GEYSER_BLOCK); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "cracked_ice"), CRACKED_ICE_BLOCK); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "enderrack"), ENDERRACK_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "enderrack"), ENDERRACK_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "twisted_nylium"), TWISTED_NYLIUM_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "twisted_nylium"), TWISTED_NYLIUM_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "jar"), JAR_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "jar"), JAR_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "ender_tip"), ENDER_TIP_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "ender_tip"), ENDER_TIP_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "ender_sprouts"), ENDER_SPROUT_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "ender_sprouts"), ENDER_SPROUT_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "pearl_pod"), PEARL_POD_BLOCK); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "pearl_pod"), PEARL_POD_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_1"), DESIZER_1); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_1"), DESIZER_1_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_2"), DESIZER_2); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_2"), DESIZER_2_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_3"), DESIZER_3); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_3"), DESIZER_3_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_4"), DESIZER_4); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_4"), DESIZER_4_ITEM); - Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_controller"), DESIZER_CONTROLLER); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_controller"), DESIZER_CONTROLLER_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_6"), DESIZER_6); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_6"), DESIZER_6_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_7"), DESIZER_7); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_7"), DESIZER_7_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_8"), DESIZER_8); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_8"), DESIZER_8_ITEM); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_9"), DESIZER_9); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_9"), DESIZER_9_ITEM); - + Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_controller"), DESIZER_CONTROLLER); Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "desizer_base"), DESIZER_BASE); - Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_base"), DESIZER_BASE_ITEM); - Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "the_end"), THE_END_BLOCK); + } + + public static void registerBlockItems() { + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "moonset_crystal_block"), MOONSET_CRYSTAL_BLOCK_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "bulba_root"), BULBA_BLOCK_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "lune_shroom"), LUNE_SHROOM_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "shimmer_lily"), SHIMMER_LILY_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "bramblebone"), BRAMBLEBONE_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "enderrack"), ENDERRACK_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "twisted_nylium"), TWISTED_NYLIUM_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "jar"), JAR_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "ender_tip"), ENDER_TIP_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "ender_sprouts"), ENDER_SPROUT_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "pearl_pod"), PEARL_POD_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_1"), DESIZER_1_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_2"), DESIZER_2_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_3"), DESIZER_3_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_4"), DESIZER_4_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_6"), DESIZER_6_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_7"), DESIZER_7_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_8"), DESIZER_8_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_9"), DESIZER_9_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_controller"), DESIZER_CONTROLLER_ITEM); + Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "desizer_base"), DESIZER_BASE_ITEM); Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "the_end"), THE_END_BLOCK_ITEM); } @@ -181,4 +180,4 @@ public static void registerClient() { BlockRenderLayerMap.INSTANCE.putBlock(PEARL_POD_BLOCK, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(PEARL_POD_BLOCK, RenderLayer.getTranslucent()); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModData.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModData.java index 5e86e03..de008aa 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModData.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModData.java @@ -2,26 +2,35 @@ import com.github.ethanicuss.astraladditions.AstralAdditions; import net.minecraft.block.Block; +import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; import net.minecraft.tag.TagKey; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class ModData { - public static final TagKey BULBA_GROWABLE = register("bulba_growable"); - public static final TagKey LUNE_SHROOM_GROWABLE = register("lune_shroom_growable"); - public static final TagKey DESIZER_IGNORE_BLOCKS = register("desizer_ignore_blocks"); - public static final TagKey DESIZER_CASING_BLOCKS = register("desizer_casing_blocks"); - public static final TagKey INGORE_TRANSMUTATION = registerItemKey("ignore_shimmer_transmutation"); + public static final TagKey BULBA_GROWABLE = registerBlockTag("bulba_growable"); + public static final TagKey LUNE_SHROOM_GROWABLE = registerBlockTag("lune_shroom_growable"); + public static final TagKey DESIZER_IGNORE_BLOCKS = registerBlockTag("desizer_ignore_blocks"); + public static final TagKey DESIZER_CASING_BLOCKS = registerBlockTag("desizer_casing_blocks"); + + public static final TagKey INGORE_TRANSMUTATION = registerItemTag("ignore_shimmer_transmutation"); + + public static final TagKey SHIMMER_TAG = registerFluidTag("shimmer"); + public static final TagKey SPUTUM_TAG = registerFluidTag("sputum"); public static final Identifier FRAGILE_ITEM_PARTS = new Identifier(AstralAdditions.MOD_ID, "gameplay/fragile_items/fragile_item"); public static final Identifier FRAGILE_ITEM_PARTS_2 = new Identifier(AstralAdditions.MOD_ID, "gameplay/fragile_items/fragile_item_2"); public static final Identifier FRAGILE_ITEM_PARTS_3 = new Identifier(AstralAdditions.MOD_ID, "gameplay/fragile_items/fragile_item_3"); - private static TagKey register(String id) { + private static TagKey registerBlockTag(String id) { return TagKey.of(Registry.BLOCK_KEY, new Identifier(AstralAdditions.MOD_ID, id)); } - private static TagKey registerItemKey(String id) { + private static TagKey registerItemTag(String id) { return TagKey.of(Registry.ITEM_KEY, new Identifier(AstralAdditions.MOD_ID, id)); } -} + + private static TagKey registerFluidTag(String id) { + return TagKey.of(Registry.FLUID_KEY, new Identifier(AstralAdditions.MOD_ID, id)); + } +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/ModEntities.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntities.java similarity index 88% rename from src/main/java/com/github/ethanicuss/astraladditions/entities/ModEntities.java rename to src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntities.java index 9d3c0d6..af06025 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/entities/ModEntities.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntities.java @@ -1,4 +1,4 @@ -package com.github.ethanicuss.astraladditions.entities; +package com.github.ethanicuss.astraladditions.registry; import com.github.ethanicuss.astraladditions.AstralAdditions; import com.github.ethanicuss.astraladditions.AstralAdditionsClient; @@ -58,16 +58,6 @@ public class ModEntities { - /*static Block[] blocks = { - Blocks.NETHERRACK, - Blocks.END_STONE, - Blocks.BLACKSTONE, - Blocks.SOUL_SOIL, - Blocks.STONE, - Blocks.GRASS, - ModBlocks.ENDERRACK_BLOCK, - ModBlocks.TWISTED_NYLIUM_BLOCK - };.specificSpawnBlocks(blocks)*/ public static final EntityType MOONMAN = Registry.register( Registry.ENTITY_TYPE, new Identifier(AstralAdditions.MOD_ID, "moonman"), @@ -183,9 +173,7 @@ public class ModEntities { .build() ); - - - public static void init() { + public static void registerEntities() { FabricDefaultAttributeRegistry.register(MOONMAN, MoonmanEntity.createMoonmanAttributes()); FabricDefaultAttributeRegistry.register(HEMOGIANT, HemogiantEntity.createGluttonAttributes()); FabricDefaultAttributeRegistry.register(VOIDTOUCHED_SKELETON, VoidtouchedSkeletonEntity.createVoidtouchedSkeletonAttributes()); @@ -199,33 +187,36 @@ public static void init() { } - public static void initClient() { + public static void registerClient() { EntityRendererRegistry.register(MOONMAN, MoonmanEntityRenderer::new); - EntityModelLayerRegistry.registerModelLayer(AstralAdditionsClient.MODEL_MOONMAN_LAYER, MoonmanEntityModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(ModEntityModelLayer.MODEL_MOONMAN_LAYER, MoonmanEntityModel::getTexturedModelData); EntityRendererRegistry.register(HEMOGIANT, HemogiantEntityRenderer::new); - EntityModelLayerRegistry.registerModelLayer(AstralAdditionsClient.MODEL_HEMOGIANT_LAYER, HemogiantEntityModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(ModEntityModelLayer.MODEL_HEMOGIANT_LAYER, HemogiantEntityModel::getTexturedModelData); EntityRendererRegistry.register(VOIDTOUCHED_SKELETON, VoidtouchedSkeletonEntityRenderer::new); - EntityModelLayerRegistry.registerModelLayer(AstralAdditionsClient.MODEL_VOIDTOUCHED_SKELETON_LAYER, SkeletonEntityModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(ModEntityModelLayer.MODEL_VOIDTOUCHED_SKELETON_LAYER, SkeletonEntityModel::getTexturedModelData); EntityRendererRegistry.register(VOIDTOUCHED_ZOMBIE, VoidtouchedZombieEntityRenderer::new); - EntityModelLayerRegistry.registerModelLayer(AstralAdditionsClient.MODEL_VOIDTOUCHED_ZOMBIE_LAYER, VoidtouchedZombieEntityRenderer::getTexturedModelData); -//SpawnRestriction.register(EntityType.BLAZE, SpawnRestriction.Location.ON_GROUND, Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, HostileEntity::canSpawnIgnoreLightLevel); + EntityModelLayerRegistry.registerModelLayer(ModEntityModelLayer.MODEL_VOIDTOUCHED_ZOMBIE_LAYER, VoidtouchedZombieEntityRenderer::getTexturedModelData); + EntityRendererRegistry.register(SHIMMER_BLAZE, ShimmerBlazeEntityRenderer::new); - EntityModelLayerRegistry.registerModelLayer(AstralAdditionsClient.MODEL_SHIMMER_BLAZE_LAYER, ShimmerBlazeEntityModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(ModEntityModelLayer.MODEL_SHIMMER_BLAZE_LAYER, ShimmerBlazeEntityModel::getTexturedModelData); EntityRendererRegistry.register(PHAST, PhastEntityRenderer::new); - EntityModelLayerRegistry.registerModelLayer(AstralAdditionsClient.MODEL_PHAST_LAYER, GhastEntityModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(ModEntityModelLayer.MODEL_PHAST_LAYER, GhastEntityModel::getTexturedModelData); EntityRendererRegistry.register(WHAST, WhastEntityRenderer::new); - EntityModelLayerRegistry.registerModelLayer(AstralAdditionsClient.MODEL_WHAST_LAYER, GhastEntityModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(ModEntityModelLayer.MODEL_WHAST_LAYER, GhastEntityModel::getTexturedModelData); EntityRendererRegistry.register(ENDER_WATCHER, EnderWatcherEntityRenderer::new); - EntityModelLayerRegistry.registerModelLayer(AstralAdditionsClient.MODEL_ENDER_WATCHER_LAYER, EnderWatcherEntityModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(ModEntityModelLayer.MODEL_ENDER_WATCHER_LAYER, EnderWatcherEntityModel::getTexturedModelData); EntityRendererRegistry.register(GLAZER, GlazerEntityRenderer::new); - EntityModelLayerRegistry.registerModelLayer(AstralAdditionsClient.MODEL_GLAZER_LAYER, BeeEntityModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(ModEntityModelLayer.MODEL_GLAZER_LAYER, BeeEntityModel::getTexturedModelData); + + EntityRendererRegistry.register(ModEntities.COGFLY, CogflyEntityRenderer::new); + EntityModelLayerRegistry.registerModelLayer(ModEntityModelLayer.MODEL_COGFLY_LAYER, CogflyEntityModel::getTexturedModelData); EntityRendererRegistry.register(ENDER_BALL, EnderBallEntityRenderer::new); @@ -250,8 +241,5 @@ public static void initClient() { EntityRendererRegistry.register(BOOMERANG, BoomerangEntityRenderer::new); EntityRendererRegistry.register(ModEntities.BLACKHOLE, BlackholeEntityRenderer::new); - - EntityRendererRegistry.register(ModEntities.COGFLY, CogflyEntityRenderer::new); - EntityModelLayerRegistry.registerModelLayer(AstralAdditionsClient.MODEL_COGFLY_LAYER, CogflyEntityModel::getTexturedModelData); } } \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntityModelLayer.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntityModelLayer.java new file mode 100644 index 0000000..c44453d --- /dev/null +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntityModelLayer.java @@ -0,0 +1,28 @@ +package com.github.ethanicuss.astraladditions.registry; + +import com.github.ethanicuss.astraladditions.AstralAdditions; +import net.minecraft.client.render.entity.model.EntityModelLayer; +import net.minecraft.util.Identifier; + +public class ModEntityModelLayer { + public static final EntityModelLayer MODEL_MOONMAN_LAYER = + new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "moonman"), "main"); + public static final EntityModelLayer MODEL_HEMOGIANT_LAYER = + new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "hemogiant"), "main"); + public static final EntityModelLayer MODEL_VOIDTOUCHED_SKELETON_LAYER = + new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "voidtouched_skeleton"), "main"); + public static final EntityModelLayer MODEL_VOIDTOUCHED_ZOMBIE_LAYER = + new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "voidtouched_zombie"), "main"); + public static final EntityModelLayer MODEL_SHIMMER_BLAZE_LAYER = + new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "shimmer_blaze"), "main"); + public static final EntityModelLayer MODEL_PHAST_LAYER = + new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "phast"), "main"); + public static final EntityModelLayer MODEL_WHAST_LAYER = + new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "whast"), "main"); + public static final EntityModelLayer MODEL_ENDER_WATCHER_LAYER = + new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "ender_watcher"), "main"); + public static final EntityModelLayer MODEL_GLAZER_LAYER = + new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "glazer"), "main"); + public static final EntityModelLayer MODEL_COGFLY_LAYER = + new EntityModelLayer(new Identifier(AstralAdditions.MOD_ID, "cogfly"), "main"); +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntitySpawn.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntitySpawns.java similarity index 87% rename from src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntitySpawn.java rename to src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntitySpawns.java index 217e660..f101aa7 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntitySpawn.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModEntitySpawns.java @@ -1,18 +1,13 @@ package com.github.ethanicuss.astraladditions.registry; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import net.fabricmc.fabric.api.biome.v1.BiomeModifications; -import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; import net.fabricmc.fabric.mixin.object.builder.SpawnRestrictionAccessor; -import net.minecraft.entity.SpawnGroup; import net.minecraft.entity.SpawnRestriction; import net.minecraft.entity.mob.FlyingEntity; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.world.Heightmap; -import net.minecraft.world.biome.Biome; -public class ModEntitySpawn { - public static void addEntitySpawn(){ +public class ModEntitySpawns { + public static void registerEntitySpawn(){ SpawnRestrictionAccessor.callRegister(ModEntities.ENDER_WATCHER, SpawnRestriction.Location.ON_GROUND, Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, HostileEntity::canSpawnIgnoreLightLevel); @@ -35,4 +30,4 @@ public static void addEntitySpawn(){ SpawnRestrictionAccessor.callRegister(ModEntities.BLACKHOLE, SpawnRestriction.Location.ON_GROUND, Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, HostileEntity::canSpawnIgnoreLightLevel); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/fluids/ModFluids.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModFluids.java similarity index 51% rename from src/main/java/com/github/ethanicuss/astraladditions/fluids/ModFluids.java rename to src/main/java/com/github/ethanicuss/astraladditions/registry/ModFluids.java index ca78926..37c690a 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/fluids/ModFluids.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModFluids.java @@ -1,10 +1,16 @@ -package com.github.ethanicuss.astraladditions.fluids; +package com.github.ethanicuss.astraladditions.registry; import com.github.ethanicuss.astraladditions.AstralAdditions; +import com.github.ethanicuss.astraladditions.fluids.ShimmerFluid; +import com.github.ethanicuss.astraladditions.fluids.SputumFluid; +import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; +import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; +import net.fabricmc.fabric.api.client.render.fluid.v1.SimpleFluidRenderHandler; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.FluidBlock; import net.minecraft.block.Material; +import net.minecraft.client.render.RenderLayer; import net.minecraft.fluid.FlowableFluid; import net.minecraft.fluid.Fluid; import net.minecraft.item.BucketItem; @@ -16,35 +22,55 @@ public class ModFluids { public static final String ASTRAL_ID = "kubejs"; + public static FlowableFluid STILL_SHIMMER; public static FlowableFluid FLOWING_SHIMMER; public static Item SHIMMER_BUCKET; public static Block SHIMMER; - public static final TagKey SHIMMER_TAG = register("sputum"); public static FlowableFluid STILL_SPUTUM; public static FlowableFluid FLOWING_SPUTUM; public static Item SPUTUM_BUCKET; public static Block SPUTUM; - public static final TagKey SPUTUM_TAG = register("sputum"); - public static void registerFluids(){ STILL_SHIMMER = Registry.register(Registry.FLUID, new Identifier(ASTRAL_ID, "shimmer"), new ShimmerFluid.Still()); FLOWING_SHIMMER = Registry.register(Registry.FLUID, new Identifier(ASTRAL_ID, "flowing_shimmer"), new ShimmerFluid.Flowing()); SHIMMER_BUCKET = Registry.register(Registry.ITEM, new Identifier(ASTRAL_ID, "shimmer_bucket"), new BucketItem(STILL_SHIMMER, new Item.Settings().recipeRemainder(Items.BUCKET).maxCount(1))); - SHIMMER = Registry.register(Registry.BLOCK, new Identifier(ASTRAL_ID, "shimmer"), new FluidBlock(STILL_SHIMMER, FabricBlockSettings.of(Material.WATER).noCollision().ticksRandomly().strength(1.0F).luminance((state) -> 10).dropsNothing())); + SHIMMER = Registry.register(Registry.BLOCK, new Identifier(ASTRAL_ID, "shimmer"), + new FluidBlock(STILL_SHIMMER, FabricBlockSettings.of(Material.WATER).noCollision().ticksRandomly().strength(1.0F).luminance((state) -> 10).dropsNothing())); STILL_SPUTUM = Registry.register(Registry.FLUID, new Identifier(AstralAdditions.MOD_ID, "sputum"), new SputumFluid.Still()); FLOWING_SPUTUM = Registry.register(Registry.FLUID, new Identifier(AstralAdditions.MOD_ID, "flowing_sputum"), new SputumFluid.Flowing()); SPUTUM_BUCKET = Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "sputum_bucket"), new BucketItem(STILL_SPUTUM, new Item.Settings().recipeRemainder(Items.BUCKET).maxCount(1))); - SPUTUM = Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "sputum"), new FluidBlock(STILL_SPUTUM, FabricBlockSettings.of(Material.WATER).noCollision().ticksRandomly().strength(1.0F).luminance((state) -> 5).dropsNothing())); + SPUTUM = Registry.register(Registry.BLOCK, new Identifier(AstralAdditions.MOD_ID, "sputum"), + new FluidBlock(STILL_SPUTUM, FabricBlockSettings.of(Material.WATER).noCollision().ticksRandomly().strength(1.0F).luminance((state) -> 5).dropsNothing())); } - private static TagKey register(String id) { - return TagKey.of(Registry.FLUID_KEY, new Identifier(id)); + + public static void registerFluidRenderersClient() { + registerHandler(ModFluids.STILL_SHIMMER, ModFluids.FLOWING_SHIMMER, new Identifier(AstralAdditions.MOD_ID, "block/shimmer/shimmer"), 0xffd6fa); + registerHandler(ModFluids.STILL_SPUTUM, ModFluids.FLOWING_SPUTUM, new Identifier(AstralAdditions.MOD_ID, "block/sputum/sputum"), 0x4c0e5e); + + + final Fluid[] TRANSLUCENT_FLUIDS = { + ModFluids.STILL_SPUTUM, ModFluids.FLOWING_SPUTUM, + ModFluids.STILL_SHIMMER, ModFluids.FLOWING_SHIMMER + }; + final Block[] TRANSPARENT_FLUID_BLOCKS = { + SPUTUM, + }; + + for (Block block : TRANSPARENT_FLUID_BLOCKS) { + FluidRenderHandlerRegistry.INSTANCE.setBlockTransparency(block, true); + } + BlockRenderLayerMap.INSTANCE.putFluids(RenderLayer.getTranslucent(), TRANSLUCENT_FLUIDS); + + } + private static void registerHandler(Fluid still, Fluid flowing, Identifier id, int tint) { + FluidRenderHandlerRegistry.INSTANCE.register(still, flowing, new SimpleFluidRenderHandler(id, id, tint)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItemProperties.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItemProperties.java index f6fb03f..365a70f 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItemProperties.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItemProperties.java @@ -7,7 +7,7 @@ public class ModItemProperties { - public static void register() { + public static void registerClient() { ModelPredicateProviderRegistry.register(ModItems.SHIMMER_FISHING_ROD, new Identifier("cast"), (stack, world, entity, seed) -> { if (entity instanceof PlayerEntity player) { boolean usingMainHand = player.getMainHandStack() == stack; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItems.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItems.java index a2659ef..2a7149f 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItems.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItems.java @@ -1,10 +1,13 @@ package com.github.ethanicuss.astraladditions.registry; import com.github.ethanicuss.astraladditions.AstralAdditions; -import com.github.ethanicuss.astraladditions.entities.ModEntities; -import com.github.ethanicuss.astraladditions.fluids.ModFluid; -import com.github.ethanicuss.astraladditions.fluids.ModFluids; import com.github.ethanicuss.astraladditions.items.*; +import com.github.ethanicuss.astraladditions.items.tools.AstralHoeItem; +import com.github.ethanicuss.astraladditions.items.tools.ChromaticVacuumItem; +import com.github.ethanicuss.astraladditions.items.tools.ShimmerBlowerItem; +import com.github.ethanicuss.astraladditions.items.tools.ShimmerFishingRodItem; +import com.github.ethanicuss.astraladditions.items.weapons.*; +import com.simibubi.create.content.equipment.goggles.GogglesItem; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.entity.EntityType; import net.minecraft.entity.effect.StatusEffects; @@ -52,7 +55,7 @@ public class ModItems { public static final Item SHOTGUN = new ShotgunItem(new FabricItemSettings().group(ItemGroup.TOOLS).maxCount(1).maxDamage(512)); public static final Item MACHINEGUN = new MachinegunItem(new FabricItemSettings().group(ItemGroup.TOOLS).maxCount(1).maxDamage(1024)); - //Ethan Balance the food ;-; + //!Ethan Balance the food ;-; public static final Item SHIMMER_FISHING_ROD = new ShimmerFishingRodItem(new Item.Settings().maxCount(1).maxDamage(150).rarity(Rarity.EPIC).group(ItemGroup.TOOLS)); public static final Item BOTTOMLESS_WATER_BUCKET = new BottomlessBucketItem(Fluids.WATER, new Item.Settings().maxCount(1).group(ItemGroup.TOOLS).rarity(Rarity.UNCOMMON)); public static final Item SHIMMERING_THREAD = new Item(new Item.Settings().group(ItemGroup.MISC).rarity(Rarity.UNCOMMON)); diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModMusic.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModMusic.java index c341ec4..eaa5389 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModMusic.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModMusic.java @@ -5,27 +5,27 @@ public class ModMusic { private static final int GAME_MIN_DELAY = 12000; private static final int GAME_MAX_DELAY = 24000;//12000, 24000 - public static final MusicSound MOON = new MusicSound(ModSounds.MUSIC_MOON, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound MENU = new MusicSound(ModSounds.MUSIC_ASTRAL_LAKES, 0, 0, true); - public static final MusicSound POST_MOON = new MusicSound(ModSounds.MUSIC_POST_MOON, 0, 0, true); - public static final MusicSound DAY = new MusicSound(ModSounds.MUSIC_DAY, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound NIGHT = new MusicSound(ModSounds.MUSIC_NIGHT, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound OW_DAY = new MusicSound(ModSounds.MUSIC_OW_DAY, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound OW_NIGHT = new MusicSound(ModSounds.MUSIC_OW_NIGHT, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound OW_CAVE = new MusicSound(ModSounds.MUSIC_OW_CAVE, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound OW_SCARY = new MusicSound(ModSounds.MUSIC_OW_SCARY, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound ORBIT = new MusicSound(ModSounds.MUSIC_ORBIT, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound MERCURY = new MusicSound(ModSounds.MUSIC_MERCURY, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound MARS = new MusicSound(ModSounds.MUSIC_MARS, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound END = new MusicSound(ModSounds.MUSIC_END, GAME_MIN_DELAY, GAME_MAX_DELAY, false); - public static final MusicSound END_BOSS = new MusicSound(ModSounds.MUSIC_END_BOSS, 0, 0, true); - public static final MusicSound WITHER = new MusicSound(ModSounds.MUSIC_WITHER, 0, 0, true); - public static final MusicSound WITHER_PHASE2 = new MusicSound(ModSounds.MUSIC_WITHER_PHASE2, 0, 0, true); - public static final MusicSound WITHER_SPAWN = new MusicSound(ModSounds.MUSIC_WITHER_SPAWN, 0, 0, true); - public static final MusicSound WITHER_DEATH = new MusicSound(ModSounds.MUSIC_WITHER_DEATH, 0, 0, true); - public static final MusicSound COMBAT = new MusicSound(ModSounds.MUSIC_COMBAT, 0, 0, true); - public static final MusicSound COMBAT_END = new MusicSound(ModSounds.MUSIC_COMBAT_END, 0, 0, true); - public static final MusicSound SHIMMER_BLAZE = new MusicSound(ModSounds.MUSIC_SHIMMER_BLAZE, 0, 0, true); + public static final MusicSound MOON = new MusicSound(ModSounds.MUSIC_MOON, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound MENU = new MusicSound(ModSounds.MUSIC_ASTRAL_LAKES, 0, 0, true); + public static final MusicSound POST_MOON = new MusicSound(ModSounds.MUSIC_POST_MOON, 0, 0, true); + public static final MusicSound DAY = new MusicSound(ModSounds.MUSIC_DAY, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound NIGHT = new MusicSound(ModSounds.MUSIC_NIGHT, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound OW_DAY = new MusicSound(ModSounds.MUSIC_OW_DAY, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound OW_NIGHT = new MusicSound(ModSounds.MUSIC_OW_NIGHT, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound OW_CAVE = new MusicSound(ModSounds.MUSIC_OW_CAVE, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound OW_SCARY = new MusicSound(ModSounds.MUSIC_OW_SCARY, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound ORBIT = new MusicSound(ModSounds.MUSIC_ORBIT, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound MERCURY = new MusicSound(ModSounds.MUSIC_MERCURY, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound MARS = new MusicSound(ModSounds.MUSIC_MARS, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound END = new MusicSound(ModSounds.MUSIC_END, GAME_MIN_DELAY, GAME_MAX_DELAY, false); + public static final MusicSound END_BOSS = new MusicSound(ModSounds.MUSIC_END_BOSS, 0, 0, true); + public static final MusicSound WITHER = new MusicSound(ModSounds.MUSIC_WITHER, 0, 0, true); + public static final MusicSound WITHER_PHASE2 = new MusicSound(ModSounds.MUSIC_WITHER_PHASE2, 0, 0, true); + public static final MusicSound WITHER_SPAWN = new MusicSound(ModSounds.MUSIC_WITHER_SPAWN, 0, 0, true); + public static final MusicSound WITHER_DEATH = new MusicSound(ModSounds.MUSIC_WITHER_DEATH, 0, 0, true); + public static final MusicSound COMBAT = new MusicSound(ModSounds.MUSIC_COMBAT, 0, 0, true); + public static final MusicSound COMBAT_END = new MusicSound(ModSounds.MUSIC_COMBAT_END, 0, 0, true); + public static final MusicSound SHIMMER_BLAZE = new MusicSound(ModSounds.MUSIC_SHIMMER_BLAZE, 0, 0, true); public static final MusicSound ASTRAL_LAKES_REMIX = new MusicSound(ModSounds.MUSIC_ASTRAL_LAKES_REMIX, 0, 0, true); -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/particle/ModParticles.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModParticles.java similarity index 56% rename from src/main/java/com/github/ethanicuss/astraladditions/particle/ModParticles.java rename to src/main/java/com/github/ethanicuss/astraladditions/registry/ModParticles.java index 9440bb4..5b14f43 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/particle/ModParticles.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModParticles.java @@ -1,6 +1,9 @@ -package com.github.ethanicuss.astraladditions.particle; +package com.github.ethanicuss.astraladditions.registry; import com.github.ethanicuss.astraladditions.AstralAdditions; +import com.github.ethanicuss.astraladditions.particle.shimmer.ShimmerBubbleParticle; +import com.github.ethanicuss.astraladditions.particle.shimmer.ShimmerSplashParticle; +import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes; import net.minecraft.particle.DefaultParticleType; import net.minecraft.util.Identifier; @@ -15,4 +18,9 @@ public static void registerParticles() { Registry.register(Registry.PARTICLE_TYPE, new Identifier(AstralAdditions.MOD_ID, "shimmer_bubble"), SHIMMER_BUBBLE); Registry.register(Registry.PARTICLE_TYPE, new Identifier(AstralAdditions.MOD_ID, "shimmer_splash"), SHIMMER_SPLASH); } + + public static void registerClient() { + ParticleFactoryRegistry.getInstance().register(ModParticles.SHIMMER_BUBBLE, ShimmerBubbleParticle.Factory::new); + ParticleFactoryRegistry.getInstance().register(ModParticles.SHIMMER_SPLASH, ShimmerSplashParticle.Factory::new); + } } \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModPotion.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModPotion.java new file mode 100644 index 0000000..90239af --- /dev/null +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModPotion.java @@ -0,0 +1,86 @@ +package com.github.ethanicuss.astraladditions.registry; + +import com.github.ethanicuss.astraladditions.AstralAdditions; +import com.github.ethanicuss.astraladditions.util.ModUtils; +import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; +import net.fabricmc.fabric.api.event.player.UseItemCallback; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsage; +import net.minecraft.item.Items; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionUtil; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.stat.Stats; +import net.minecraft.tag.TagKey; +import net.minecraft.util.Identifier; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.registry.Registry; +import net.minecraft.world.RaycastContext; +import net.minecraft.world.World; +import net.minecraft.world.event.GameEvent; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +public class ModPotion { + private static final Map COLORS = new HashMap<>(); + + public static Potion SHIMMER; + public static Potion SPUTUM; + + public static void registerPotions() { + SHIMMER = register("shimmer", 0xffd6fa, List.of( + new StatusEffectInstance(StatusEffects.GLOWING, 600), + new StatusEffectInstance(StatusEffects.NIGHT_VISION, 600)), + ModData.SHIMMER_TAG + ); + + SPUTUM = register("sputum", 0x4c0e5e, List.of( + new StatusEffectInstance(StatusEffects.WEAKNESS, 600), + new StatusEffectInstance(StatusEffects.WITHER, 600)), + ModData.SPUTUM_TAG + ); + + + } + //? if you dont care about like custom fluid bottle interaction + //? java doesnt have default arguments like python or kotlin, how smelly + private static Potion register(String name, int color, List effects) { + return register(name, color, effects, null); + } + + private static Potion register(String name, int color, List effects, TagKey fluidForBottling ) { + Potion potion = Registry.register(Registry.POTION, + new Identifier(AstralAdditions.MOD_ID, name), + new Potion(effects.toArray(new StatusEffectInstance[0])) + ); + COLORS.put(potion, color); + + if (fluidForBottling != null) { + ModUtils.addPotionBottlingHandler(fluidForBottling, potion); + } + return potion; + } + + public static void registerClient() { + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> { + if (tintIndex != 0) return 0xFFFFFF; + Potion potion = PotionUtil.getPotion(stack); + Integer color = COLORS.get(potion); + return color != null ? color : PotionUtil.getColor(stack); + }, Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION, Items.TIPPED_ARROW); + } + + +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModRecipes.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModRecipes.java index b284f62..b138fd0 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModRecipes.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModRecipes.java @@ -2,6 +2,7 @@ import com.github.ethanicuss.astraladditions.AstralAdditions; +import com.github.ethanicuss.astraladditions.recipes.ChromaticVacuumRecipe; import com.github.ethanicuss.astraladditions.recipes.DesizerRecipe; import com.github.ethanicuss.astraladditions.recipes.TransmuteRecipe; import net.minecraft.util.Identifier; @@ -29,4 +30,4 @@ public static void registerRecipes() { Registry.register(Registry.RECIPE_TYPE, new Identifier(AstralAdditions.MOD_ID, TransmuteRecipe.Type.ID), TransmuteRecipe.Type.INSTANCE); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModSounds.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModSounds.java index 08a42ef..3a9ed5e 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModSounds.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModSounds.java @@ -6,50 +6,50 @@ import net.minecraft.util.registry.Registry; public class ModSounds { - public static final Identifier MUSIC_MOON_ID = new Identifier(AstralAdditions.MOD_ID, "music_moon"); - public static final SoundEvent MUSIC_MOON = new SoundEvent(MUSIC_MOON_ID); - public static final Identifier MUSIC_ASTRAL_LAKES_ID = new Identifier(AstralAdditions.MOD_ID, "music_menu"); - public static final SoundEvent MUSIC_ASTRAL_LAKES = new SoundEvent(MUSIC_ASTRAL_LAKES_ID); - public static final Identifier MUSIC_POST_MOON_ID = new Identifier(AstralAdditions.MOD_ID, "music_post_moon"); - public static final SoundEvent MUSIC_POST_MOON = new SoundEvent(MUSIC_POST_MOON_ID); - public static final Identifier MUSIC_DAY_ID = new Identifier(AstralAdditions.MOD_ID, "music_day"); - public static final SoundEvent MUSIC_DAY = new SoundEvent(MUSIC_DAY_ID); - public static final Identifier MUSIC_OW_CAVE_ID = new Identifier(AstralAdditions.MOD_ID, "music_ow_cave"); - public static final SoundEvent MUSIC_OW_CAVE = new SoundEvent(MUSIC_OW_CAVE_ID); - public static final Identifier MUSIC_OW_SCARY_ID = new Identifier(AstralAdditions.MOD_ID, "music_ow_scary"); - public static final SoundEvent MUSIC_OW_SCARY = new SoundEvent(MUSIC_OW_SCARY_ID); - public static final Identifier MUSIC_OW_DAY_ID = new Identifier(AstralAdditions.MOD_ID, "music_ow_day"); - public static final SoundEvent MUSIC_OW_DAY = new SoundEvent(MUSIC_OW_DAY_ID); - public static final Identifier MUSIC_OW_NIGHT_ID = new Identifier(AstralAdditions.MOD_ID, "music_ow_night"); - public static final SoundEvent MUSIC_OW_NIGHT = new SoundEvent(MUSIC_OW_NIGHT_ID); - public static final Identifier MUSIC_NIGHT_ID = new Identifier(AstralAdditions.MOD_ID, "music_night"); - public static final SoundEvent MUSIC_NIGHT = new SoundEvent(MUSIC_NIGHT_ID); - public static final Identifier MUSIC_ORBIT_ID = new Identifier(AstralAdditions.MOD_ID, "music_orbit"); - public static final SoundEvent MUSIC_ORBIT = new SoundEvent(MUSIC_ORBIT_ID); - public static final Identifier MUSIC_MERCURY_ID = new Identifier(AstralAdditions.MOD_ID, "music_mercury"); - public static final SoundEvent MUSIC_MERCURY = new SoundEvent(MUSIC_MERCURY_ID); - public static final Identifier MUSIC_MARS_ID = new Identifier(AstralAdditions.MOD_ID, "music_mars"); - public static final SoundEvent MUSIC_MARS = new SoundEvent(MUSIC_MARS_ID); - public static final Identifier MUSIC_END_ID = new Identifier(AstralAdditions.MOD_ID, "music_end"); - public static final SoundEvent MUSIC_END = new SoundEvent(MUSIC_END_ID); - public static final Identifier MUSIC_END_BOSS_ID = new Identifier(AstralAdditions.MOD_ID, "music_end_boss"); - public static final SoundEvent MUSIC_END_BOSS = new SoundEvent(MUSIC_END_BOSS_ID); - public static final Identifier MUSIC_WITHER_ID = new Identifier(AstralAdditions.MOD_ID, "music_wither"); - public static final SoundEvent MUSIC_WITHER = new SoundEvent(MUSIC_WITHER_ID); - public static final Identifier MUSIC_WITHER_PHASE2_ID = new Identifier(AstralAdditions.MOD_ID, "music_wither_phase2"); - public static final SoundEvent MUSIC_WITHER_PHASE2 = new SoundEvent(MUSIC_WITHER_PHASE2_ID); - public static final Identifier MUSIC_WITHER_SPAWN_ID = new Identifier(AstralAdditions.MOD_ID, "music_wither_spawn"); - public static final SoundEvent MUSIC_WITHER_SPAWN = new SoundEvent(MUSIC_WITHER_SPAWN_ID); - public static final Identifier MUSIC_WITHER_DEATH_ID = new Identifier(AstralAdditions.MOD_ID, "music_wither_death"); - public static final SoundEvent MUSIC_WITHER_DEATH = new SoundEvent(MUSIC_WITHER_DEATH_ID); - public static final Identifier MUSIC_COMBAT_ID = new Identifier(AstralAdditions.MOD_ID, "music_combat"); - public static final SoundEvent MUSIC_COMBAT = new SoundEvent(MUSIC_COMBAT_ID); - public static final Identifier MUSIC_COMBAT_END_ID = new Identifier(AstralAdditions.MOD_ID, "music_combat_end"); - public static final SoundEvent MUSIC_COMBAT_END = new SoundEvent(MUSIC_COMBAT_END_ID); - public static final Identifier MUSIC_SHIMMER_BLAZE_ID = new Identifier(AstralAdditions.MOD_ID, "music_shimmer_blaze"); - public static final SoundEvent MUSIC_SHIMMER_BLAZE = new SoundEvent(MUSIC_SHIMMER_BLAZE_ID); + public static final Identifier MUSIC_MOON_ID = new Identifier(AstralAdditions.MOD_ID, "music_moon"); + public static final SoundEvent MUSIC_MOON = new SoundEvent(MUSIC_MOON_ID); + public static final Identifier MUSIC_ASTRAL_LAKES_ID = new Identifier(AstralAdditions.MOD_ID, "music_menu"); + public static final SoundEvent MUSIC_ASTRAL_LAKES = new SoundEvent(MUSIC_ASTRAL_LAKES_ID); + public static final Identifier MUSIC_POST_MOON_ID = new Identifier(AstralAdditions.MOD_ID, "music_post_moon"); + public static final SoundEvent MUSIC_POST_MOON = new SoundEvent(MUSIC_POST_MOON_ID); + public static final Identifier MUSIC_DAY_ID = new Identifier(AstralAdditions.MOD_ID, "music_day"); + public static final SoundEvent MUSIC_DAY = new SoundEvent(MUSIC_DAY_ID); + public static final Identifier MUSIC_OW_CAVE_ID = new Identifier(AstralAdditions.MOD_ID, "music_ow_cave"); + public static final SoundEvent MUSIC_OW_CAVE = new SoundEvent(MUSIC_OW_CAVE_ID); + public static final Identifier MUSIC_OW_SCARY_ID = new Identifier(AstralAdditions.MOD_ID, "music_ow_scary"); + public static final SoundEvent MUSIC_OW_SCARY = new SoundEvent(MUSIC_OW_SCARY_ID); + public static final Identifier MUSIC_OW_DAY_ID = new Identifier(AstralAdditions.MOD_ID, "music_ow_day"); + public static final SoundEvent MUSIC_OW_DAY = new SoundEvent(MUSIC_OW_DAY_ID); + public static final Identifier MUSIC_OW_NIGHT_ID = new Identifier(AstralAdditions.MOD_ID, "music_ow_night"); + public static final SoundEvent MUSIC_OW_NIGHT = new SoundEvent(MUSIC_OW_NIGHT_ID); + public static final Identifier MUSIC_NIGHT_ID = new Identifier(AstralAdditions.MOD_ID, "music_night"); + public static final SoundEvent MUSIC_NIGHT = new SoundEvent(MUSIC_NIGHT_ID); + public static final Identifier MUSIC_ORBIT_ID = new Identifier(AstralAdditions.MOD_ID, "music_orbit"); + public static final SoundEvent MUSIC_ORBIT = new SoundEvent(MUSIC_ORBIT_ID); + public static final Identifier MUSIC_MERCURY_ID = new Identifier(AstralAdditions.MOD_ID, "music_mercury"); + public static final SoundEvent MUSIC_MERCURY = new SoundEvent(MUSIC_MERCURY_ID); + public static final Identifier MUSIC_MARS_ID = new Identifier(AstralAdditions.MOD_ID, "music_mars"); + public static final SoundEvent MUSIC_MARS = new SoundEvent(MUSIC_MARS_ID); + public static final Identifier MUSIC_END_ID = new Identifier(AstralAdditions.MOD_ID, "music_end"); + public static final SoundEvent MUSIC_END = new SoundEvent(MUSIC_END_ID); + public static final Identifier MUSIC_END_BOSS_ID = new Identifier(AstralAdditions.MOD_ID, "music_end_boss"); + public static final SoundEvent MUSIC_END_BOSS = new SoundEvent(MUSIC_END_BOSS_ID); + public static final Identifier MUSIC_WITHER_ID = new Identifier(AstralAdditions.MOD_ID, "music_wither"); + public static final SoundEvent MUSIC_WITHER = new SoundEvent(MUSIC_WITHER_ID); + public static final Identifier MUSIC_WITHER_PHASE2_ID = new Identifier(AstralAdditions.MOD_ID, "music_wither_phase2"); + public static final SoundEvent MUSIC_WITHER_PHASE2 = new SoundEvent(MUSIC_WITHER_PHASE2_ID); + public static final Identifier MUSIC_WITHER_SPAWN_ID = new Identifier(AstralAdditions.MOD_ID, "music_wither_spawn"); + public static final SoundEvent MUSIC_WITHER_SPAWN = new SoundEvent(MUSIC_WITHER_SPAWN_ID); + public static final Identifier MUSIC_WITHER_DEATH_ID = new Identifier(AstralAdditions.MOD_ID, "music_wither_death"); + public static final SoundEvent MUSIC_WITHER_DEATH = new SoundEvent(MUSIC_WITHER_DEATH_ID); + public static final Identifier MUSIC_COMBAT_ID = new Identifier(AstralAdditions.MOD_ID, "music_combat"); + public static final SoundEvent MUSIC_COMBAT = new SoundEvent(MUSIC_COMBAT_ID); + public static final Identifier MUSIC_COMBAT_END_ID = new Identifier(AstralAdditions.MOD_ID, "music_combat_end"); + public static final SoundEvent MUSIC_COMBAT_END = new SoundEvent(MUSIC_COMBAT_END_ID); + public static final Identifier MUSIC_SHIMMER_BLAZE_ID = new Identifier(AstralAdditions.MOD_ID, "music_shimmer_blaze"); + public static final SoundEvent MUSIC_SHIMMER_BLAZE = new SoundEvent(MUSIC_SHIMMER_BLAZE_ID); public static final Identifier MUSIC_ASTRAL_LAKES_REMIX_ID = new Identifier(AstralAdditions.MOD_ID, "music_astral_lakes_remix"); - public static final SoundEvent MUSIC_ASTRAL_LAKES_REMIX = new SoundEvent(MUSIC_ASTRAL_LAKES_REMIX_ID); + public static final SoundEvent MUSIC_ASTRAL_LAKES_REMIX = new SoundEvent(MUSIC_ASTRAL_LAKES_REMIX_ID); public static final Identifier ITEM_EGUITAR_NOTE_ID = new Identifier(AstralAdditions.MOD_ID, "item/note_eguitar"); public static final SoundEvent ITEM_EGUITAR_NOTE = new SoundEvent(ITEM_EGUITAR_NOTE_ID); @@ -77,4 +77,4 @@ public static void registerSounds() { Registry.register(Registry.SOUND_EVENT, MUSIC_ASTRAL_LAKES_REMIX_ID, MUSIC_ASTRAL_LAKES_REMIX); Registry.register(Registry.SOUND_EVENT, ITEM_EGUITAR_NOTE_ID, ITEM_EGUITAR_NOTE); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/ethanicuss/astraladditions/blocks/ImplementedInventory.java b/src/main/java/com/github/ethanicuss/astraladditions/util/ImplementedInventory.java similarity index 98% rename from src/main/java/com/github/ethanicuss/astraladditions/blocks/ImplementedInventory.java rename to src/main/java/com/github/ethanicuss/astraladditions/util/ImplementedInventory.java index 296ddc1..f8607a3 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/blocks/ImplementedInventory.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/util/ImplementedInventory.java @@ -1,4 +1,4 @@ -package com.github.ethanicuss.astraladditions.blocks; +package com.github.ethanicuss.astraladditions.util; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventories; diff --git a/src/main/java/com/github/ethanicuss/astraladditions/util/ModUtils.java b/src/main/java/com/github/ethanicuss/astraladditions/util/ModUtils.java index 5df3c99..a7bde1a 100644 --- a/src/main/java/com/github/ethanicuss/astraladditions/util/ModUtils.java +++ b/src/main/java/com/github/ethanicuss/astraladditions/util/ModUtils.java @@ -1,82 +1,122 @@ package com.github.ethanicuss.astraladditions.util; +import net.fabricmc.fabric.api.event.player.UseItemCallback; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.nbt.NbtIo; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsage; +import net.minecraft.item.Items; import net.minecraft.particle.ParticleEffect; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionUtil; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.minecraft.util.math.Box; - +import net.minecraft.sound.SoundEvents; +import net.minecraft.stat.Stats; +import net.minecraft.tag.TagKey; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import org.spongepowered.include.com.google.gson.JsonObject; -import java.io.StringReader; import java.util.List; +import net.minecraft.world.RaycastContext; +import net.minecraft.world.event.GameEvent; public class ModUtils { - public static void spawnForcedParticles(ServerWorld world, T particle, double x, double y, double z, int count, double deltaX, double deltaY, double deltaZ, double speed) { - for (ServerPlayerEntity player : world.getPlayers()) { - world.spawnParticles(player, particle, true, x, y, z, count, deltaX, deltaY, deltaZ, speed); - } - } + public static void spawnForcedParticles(ServerWorld world, T particle, double x, double y, double z, int count, double deltaX, double deltaY, double deltaZ, double speed) { + for (ServerPlayerEntity player : world.getPlayers()) { + world.spawnParticles(player, particle, true, x, y, z, count, deltaX, deltaY, deltaZ, speed); + } + } + + public static void playSound(ServerWorld world, double x, double y, double z, SoundEvent sound, SoundCategory category, float vol, float pitch, boolean falloff) { + for (ServerPlayerEntity player : world.getPlayers()) { + player.world.playSound(x, y, z, sound, category, vol, pitch, falloff); + } + } + + public static void pullPlayer(Entity entityActor, World world, boolean onlyPlayers, double strength, double vStrength, double entityPosX, double entityPosZ, double rangeX1, double rangeY1, double rangeZ1, double rangeX2, double rangeY2, double rangeZ2) { + + List pl = world.getOtherEntities(entityActor, new Box(rangeX1, rangeY1, rangeZ1, rangeX2, rangeY2, rangeZ2)); + for (Entity p : pl) { + if (p instanceof LivingEntity) { + int strMult = 1; + if (!(p instanceof PlayerEntity)) { + strMult *= 2; + //setting onlyPlayers to true will cause it to only pull players + if (onlyPlayers) { + strMult = 0; + } + } + double xdiff = entityPosX - p.getX(); + double zdiff = entityPosZ - p.getZ(); + double dist = Math.sqrt(Math.pow(xdiff, 2) + Math.pow(zdiff, 2)); + if (dist < 10) { + if (xdiff == 0) { + xdiff = 0.01; + } + if (zdiff == 0) { + zdiff = 0.01; + } + double angleX = Math.atan(Math.abs(zdiff) / xdiff); + double angleZ = Math.atan(Math.abs(xdiff) / zdiff); + double cosX = Math.cos(angleX); + double cosZ = Math.cos(angleZ); + if (cosX == 0) { + cosX = 0.01; + } + if (cosZ == 0) { + cosZ = 0.01; + } + dist = -dist + 10; + p.addVelocity(dist * cosX * strength * strMult * (Math.abs(angleX) / angleX), dist * vStrength * strMult, dist * cosZ * strength * strMult * (Math.abs(angleZ) / angleZ)); + } + } + } + } + + //? lets us easily add custom fluid bottling + public static void addPotionBottlingHandler(TagKey fluidTag, Potion potion) { + UseItemCallback.EVENT.register((player, world, hand) -> { + ItemStack inHand = player.getStackInHand(hand); + if (inHand.getItem() != Items.GLASS_BOTTLE) return TypedActionResult.pass(inHand); + + BlockHitResult hit = raycast(world, player, RaycastContext.FluidHandling.SOURCE_ONLY); + if (hit.getType() != HitResult.Type.BLOCK) return TypedActionResult.pass(inHand); + + BlockPos pos = hit.getBlockPos(); + if (!world.canPlayerModifyAt(player, pos)) return TypedActionResult.pass(inHand); + if (!world.getFluidState(pos).getFluid().isIn(fluidTag)) return TypedActionResult.pass(inHand); + + ItemStack out = PotionUtil.setPotion(new ItemStack(Items.POTION), potion); - public static void playSound(ServerWorld world, double x, double y, double z, SoundEvent sound, SoundCategory category, float vol, float pitch, boolean falloff) { - for (ServerPlayerEntity player : world.getPlayers()) { - player.world.playSound(x, y, z, sound, category, vol, pitch, falloff); - } - } + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.NEUTRAL, 1.0F, 1.0F); + world.emitGameEvent(player, GameEvent.FLUID_PICKUP, pos); + player.incrementStat(Stats.USED.getOrCreateStat(Items.GLASS_BOTTLE)); - //Currently can only pull to entity. Might change in the future. You can look at EnderBallEntity code to see how to use this. - public static void pullPlayer(Entity entityActor, World world, boolean onlyPlayers, double strength, double vStrength, double entityPosX, double entityPosZ, double rangeX1, double rangeY1, double rangeZ1, double rangeX2, double rangeY2, double rangeZ2){ -// if (!type) { -// List pl = world.getOtherEntities(entityActor, new Box(rangeX1, rangeY1, rangeZ1, rangeX2, rangeY2, rangeZ2)); -// } -// if (type) { -// List pl = world.getPlayers(); -// } - List pl = world.getOtherEntities(entityActor, new Box(rangeX1, rangeY1, rangeZ1, rangeX2, rangeY2, rangeZ2)); - for (Entity p : pl) { - if (p instanceof LivingEntity){ - int strMult = 1; - if (!(p instanceof PlayerEntity)) { - strMult *= 2; - //setting onlyPlayers to true will cause it to only pull players - if (onlyPlayers) { - strMult = 0; - } - } - double xdiff = entityPosX - p.getX(); - double zdiff = entityPosZ - p.getZ(); - double dist = Math.sqrt(Math.pow(xdiff, 2) + Math.pow(zdiff, 2)); - if (dist < 10) { - if (xdiff == 0) { - xdiff = 0.01; - } - if (zdiff == 0) { - zdiff = 0.01; - } - double angleX = Math.atan(Math.abs(zdiff) / xdiff); - double angleZ = Math.atan(Math.abs(xdiff) / zdiff); - double cosX = Math.cos(angleX); - double cosZ = Math.cos(angleZ); - if (cosX == 0) { - cosX = 0.01; - } - if (cosZ == 0) { - cosZ = 0.01; - } - dist = -dist + 10; - p.addVelocity(dist * cosX * strength * strMult * (Math.abs(angleX) / angleX), dist * vStrength * strMult, dist * cosZ * strength * strMult * (Math.abs(angleZ) / angleZ)); - } - } - } - } + ItemStack exchanged = ItemUsage.exchangeStack(inHand, player, out); -} + if (inHand.isEmpty()) { + player.setStackInHand(hand, exchanged); + } + return TypedActionResult.success(player.getStackInHand(hand), world.isClient); + }); + } + //? the raycast i wanted to use was like protected or something so i had to make my own :( + //? used in addPotionBottlingHandler + private static BlockHitResult raycast(World world, PlayerEntity player, RaycastContext.FluidHandling fluidMode) { + Vec3d start = player.getCameraPosVec(1.0F); + Vec3d dir = player.getRotationVec(1.0F); + Vec3d end = start.add(dir.multiply(5.0D)); + return world.raycast(new RaycastContext(start, end, RaycastContext.ShapeType.OUTLINE, fluidMode, player)); + } +} \ No newline at end of file diff --git a/src/main/resources/assets/astraladditions/lang/en_us.json b/src/main/resources/assets/astraladditions/lang/en_us.json index 690bcbd..9ce4442 100644 --- a/src/main/resources/assets/astraladditions/lang/en_us.json +++ b/src/main/resources/assets/astraladditions/lang/en_us.json @@ -42,13 +42,14 @@ "item.astraladditions.disc_astral_lakes_remix.desc": "Astral Lakes (ethanicuss' meow moew :wolfGif: remix) - ethanicuss", "item.astraladditions.rapier": "Rapier", "item.astraladditions.parry_shield": "Round Shield", + "item.astraladditions.cogfly": "Cogfly", "item.astraladditions.shimmer_fishing_rod": "Shimmer Fishing Rod", "item.astraladditions.shimmering_thread": "Shimmering Thread", "item.astraladditions.shimmer_trout": "Shimmer Trout", "item.astraladditions.shimmer_shish": "Shish", "item.astraladditions.bottomless_water_bucket": "Bottomless Water Bucket", - + "block.astraladditions.enderrack": "Enderrack", "block.astraladditions.twisted_nylium": "Twisted Nylium", "block.astraladditions.ender_sprouts": "Ender Sprouts", @@ -113,5 +114,19 @@ "category.astraladditions.shattering.workstations": "Any tool with this enchantment", "effect.astraladditions.sink": "Sinking", - "effect.astraladditions.parry": "Parry" + "effect.astraladditions.parry": "Parry", + "effect.astraladditions.frost": "Frost", + + "item.minecraft.potion.effect.shimmer": "Bottle of Shimmer", + "item.minecraft.splash_potion.effect.shimmer": "Splash Bottle of Shimmer", + "item.minecraft.lingering_potion.effect.shimmer": "Lingering Bottle of Shimmer", + "item.minecraft.tipped_arrow.effect.shimmer": "Arrow of Shimmer", + + "item.minecraft.potion.effect.sputum": "Bottle of Sputum", + "item.minecraft.splash_potion.effect.sputum": "Splash Bottle of Sputum", + "item.minecraft.lingering_potion.effect.sputum": "Lingering Bottle of Sputum", + "item.minecraft.tipped_arrow.effect.sputum": "Arrow of Sputum", + + "tooltip.astraladditions.cogfly": "W.I.P for 2.2" + } \ No newline at end of file diff --git a/src/main/resources/assets/astraladditions/models/block/shimmer.json b/src/main/resources/assets/astraladditions/models/block/shimmer.json index 10f2907..c4823ed 100644 --- a/src/main/resources/assets/astraladditions/models/block/shimmer.json +++ b/src/main/resources/assets/astraladditions/models/block/shimmer.json @@ -1,6 +1,5 @@ { "textures": { - "particle": "astraladditions:block/shimmer" + "particle": "astraladditions:block/shimmer/shimmer" } -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/astraladditions/models/block/shimmerflow.json b/src/main/resources/assets/astraladditions/models/block/shimmerflow.json index 9c9c894..98f2129 100644 --- a/src/main/resources/assets/astraladditions/models/block/shimmerflow.json +++ b/src/main/resources/assets/astraladditions/models/block/shimmerflow.json @@ -1,6 +1,5 @@ { "textures": { - "particle": "astraladditions:block/shimmerflow" + "particle": "astraladditions:block/shimmer/shimmerflow" } -} - +} \ No newline at end of file diff --git a/src/main/resources/assets/astraladditions/textures/block/shimmer.png b/src/main/resources/assets/astraladditions/textures/block/shimmer/shimmer.png similarity index 100% rename from src/main/resources/assets/astraladditions/textures/block/shimmer.png rename to src/main/resources/assets/astraladditions/textures/block/shimmer/shimmer.png diff --git a/src/main/resources/assets/astraladditions/textures/block/shimmer.png.mcmeta b/src/main/resources/assets/astraladditions/textures/block/shimmer/shimmer.png.mcmeta similarity index 100% rename from src/main/resources/assets/astraladditions/textures/block/shimmer.png.mcmeta rename to src/main/resources/assets/astraladditions/textures/block/shimmer/shimmer.png.mcmeta diff --git a/src/main/resources/assets/astraladditions/textures/block/shimmerflow.png b/src/main/resources/assets/astraladditions/textures/block/shimmer/shimmerflow.png similarity index 100% rename from src/main/resources/assets/astraladditions/textures/block/shimmerflow.png rename to src/main/resources/assets/astraladditions/textures/block/shimmer/shimmerflow.png diff --git a/src/main/resources/assets/astraladditions/textures/block/shimmerflow.png.mcmeta b/src/main/resources/assets/astraladditions/textures/block/shimmer/shimmerflow.png.mcmeta similarity index 100% rename from src/main/resources/assets/astraladditions/textures/block/shimmerflow.png.mcmeta rename to src/main/resources/assets/astraladditions/textures/block/shimmer/shimmerflow.png.mcmeta diff --git a/src/main/resources/assets/astraladditions/textures/block/shimmerflowold.png b/src/main/resources/assets/astraladditions/textures/block/shimmer/shimmerflowold.png similarity index 100% rename from src/main/resources/assets/astraladditions/textures/block/shimmerflowold.png rename to src/main/resources/assets/astraladditions/textures/block/shimmer/shimmerflowold.png diff --git a/src/main/resources/assets/astraladditions/textures/gui/README.txt b/src/main/resources/assets/astraladditions/textures/gui/README.txt new file mode 100644 index 0000000..34ee422 --- /dev/null +++ b/src/main/resources/assets/astraladditions/textures/gui/README.txt @@ -0,0 +1,2 @@ +DO NOT change the size of shimmer_air_bubbles.png +it NEEDS to be 256 by 256 to match with minecrafts texture. \ No newline at end of file diff --git a/src/main/resources/assets/astraladditions/textures/gui/shimmer_air_bubbles.png b/src/main/resources/assets/astraladditions/textures/gui/shimmer_air_bubbles.png new file mode 100644 index 0000000..19473ce Binary files /dev/null and b/src/main/resources/assets/astraladditions/textures/gui/shimmer_air_bubbles.png differ diff --git a/src/main/resources/assets/astraladditions/textures/item/bottomless_water_bucket.png b/src/main/resources/assets/astraladditions/textures/item/bottomless_water_bucket.png new file mode 100644 index 0000000..44eca28 Binary files /dev/null and b/src/main/resources/assets/astraladditions/textures/item/bottomless_water_bucket.png differ diff --git a/src/main/resources/assets/astraladditions/textures/particle/shimmer_bubble.png b/src/main/resources/assets/astraladditions/textures/particle/shimmer_bubble.png index 5838da3..7e3196d 100644 Binary files a/src/main/resources/assets/astraladditions/textures/particle/shimmer_bubble.png and b/src/main/resources/assets/astraladditions/textures/particle/shimmer_bubble.png differ diff --git a/src/main/resources/assets/astraladditions/textures/particle/shimmer_bubble.png.mcmeta b/src/main/resources/assets/astraladditions/textures/particle/shimmer_bubble.png.mcmeta deleted file mode 100644 index 5d22856..0000000 --- a/src/main/resources/assets/astraladditions/textures/particle/shimmer_bubble.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 8 - } -} diff --git a/src/main/resources/assets/astraladditions/textures/particle/shimmer_bubble1.png b/src/main/resources/assets/astraladditions/textures/particle/shimmer_bubble1.png deleted file mode 100644 index 7e3196d..0000000 Binary files a/src/main/resources/assets/astraladditions/textures/particle/shimmer_bubble1.png and /dev/null differ diff --git a/src/main/resources/astraladditions.mixins.json b/src/main/resources/astraladditions.mixins.json index fa29040..c61d9f0 100644 --- a/src/main/resources/astraladditions.mixins.json +++ b/src/main/resources/astraladditions.mixins.json @@ -5,12 +5,16 @@ "compatibilityLevel": "JAVA_17", "mixins": [ "ParryEffectMixin", + "ShimmerEffectMixin", "EntityAccessor", "ItemEntityMixin", "NerfedShulkers", "ParticleRecolourMixin", - "ShimmerEffect", "betterdragon.AbstractPhaseAccessor", + "betterdragon.DragonAccessor", + "betterdragon.HoverPhaseAccessor", + "betterdragon.LandingPhaseAccessor", + "betterdragon.SittingFlamingPhaseAccessor", "betterdragon.BetterAbstractSittingPhase", "betterdragon.BetterChargingPlayerPhase", "betterdragon.BetterDragon", @@ -18,16 +22,17 @@ "betterdragon.BetterLandingPhase", "betterdragon.BetterSittingAttackPhase", "betterdragon.BetterSittingFlamingPhase", - "betterdragon.DragonAccessor", - "betterdragon.HoverPhaseAccessor", - "betterdragon.LandingPhaseAccessor", - "betterdragon.SittingFlamingPhaseAccessor", - "fishing.BottomlessBucketItemMixin", + "fishing.FishingBobberEntityAccessor", - "fishing.FishingBobberEntityMixin" + "fishing.FishingBobberEntityMixin", + "fishing.BottomlessBucketItemMixin" + ], + "client": [ - "SpaceMusic" + "SpaceMusicMixin", + "ParticleRecolourMixin", + "InGameHudMixin" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/data/astraladditions/tags/fluids/shimmer.json b/src/main/resources/data/astraladditions/tags/fluids/shimmer.json new file mode 100644 index 0000000..42cd222 --- /dev/null +++ b/src/main/resources/data/astraladditions/tags/fluids/shimmer.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "kubejs:shimmer", + "kubejs:flowing_shimmer" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/astraladditions/tags/fluids/sputum.json b/src/main/resources/data/astraladditions/tags/fluids/sputum.json new file mode 100644 index 0000000..665c7ac --- /dev/null +++ b/src/main/resources/data/astraladditions/tags/fluids/sputum.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "astraladditions:sputum", + "astraladditions:flowing_sputum" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/fluids/shimmer.json b/src/main/resources/data/minecraft/tags/fluids/shimmer.json deleted file mode 100644 index 5ee2f9a..0000000 --- a/src/main/resources/data/minecraft/tags/fluids/shimmer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": - [ - "kubejs:shimmer", - "kubejs:flowing_shimmer" - ] -} \ No newline at end of file