diff --git a/build.properties b/build.properties index c6a2b2a110..8f3291c8b9 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ -#Sat Oct 14 17:25:20 UTC 2023 +#Sun Oct 22 22:44:09 UTC 2023 mapping_version=1.19.2 version=3.4 mod_name=Quark mc_version=1.19.2 mapping_channel=official mod_id=quark -build_number=417 +build_number=419 dir_output=../Build Output/Quark/ diff --git a/changelog.txt b/changelog.txt index 4833054e16..b06ac55fb8 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +1,2 @@ -- Fixed a crash when a villager fails to restock its trade for unknown reasons \ No newline at end of file +- Fixed hammer losing variant info when switching block +- Fixed hammer on slabs making double slabs \ No newline at end of file diff --git a/contributors.properties b/contributors.properties index 9704d4557d..44f036b533 100644 --- a/contributors.properties +++ b/contributors.properties @@ -887,3 +887,10 @@ TheMelon27=2 YYMB=2 RavenDarkeye=1 kairosylph=2 +xMiaX=1 +AppleTeawalker=2 +AppleTea5202=2 +xhonter=2 +xdata3=2 +meep706=1 +LocoRock=2 diff --git a/src/main/java/org/violetmoon/quark/QuarkForgeCapabilities.java b/src/main/java/org/violetmoon/quark/QuarkForgeCapabilities.java index ed7e28cfd8..cfcf9da996 100644 --- a/src/main/java/org/violetmoon/quark/QuarkForgeCapabilities.java +++ b/src/main/java/org/violetmoon/quark/QuarkForgeCapabilities.java @@ -1,14 +1,9 @@ package org.violetmoon.quark; -import org.violetmoon.quark.api.ICustomSorting; -import org.violetmoon.quark.api.IMagnetTracker; -import org.violetmoon.quark.api.IPistonCallback; -import org.violetmoon.quark.api.IRuneColorProvider; -import org.violetmoon.quark.api.ITransferManager; - import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.capabilities.CapabilityToken; +import org.violetmoon.quark.api.*; //TODO: put this somewhere in a Forge-only API package public class QuarkForgeCapabilities { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/CrateBlock.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/CrateBlock.java index 3cd1a6ca11..0060e7ff3a 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/CrateBlock.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/CrateBlock.java @@ -1,13 +1,5 @@ package org.violetmoon.quark.addons.oddities.block; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.addons.oddities.block.be.CrateBlockEntity; -import org.violetmoon.quark.addons.oddities.module.CrateModule; -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -33,6 +25,13 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.addons.oddities.block.be.CrateBlockEntity; +import org.violetmoon.quark.addons.oddities.module.CrateModule; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class CrateBlock extends QuarkBlock implements EntityBlock { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/MagnetBlock.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/MagnetBlock.java index 5becac7ef9..d50bd96bb9 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/MagnetBlock.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/MagnetBlock.java @@ -1,17 +1,5 @@ package org.violetmoon.quark.addons.oddities.block; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.addons.oddities.block.be.MagnetBlockEntity; -import org.violetmoon.quark.addons.oddities.block.be.MagnetizedBlockBlockEntity; -import org.violetmoon.quark.addons.oddities.magnetsystem.MagnetSystem; -import org.violetmoon.quark.addons.oddities.module.MagnetsModule; -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -22,11 +10,7 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.Mirror; -import net.minecraft.world.level.block.Rotation; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -38,6 +22,16 @@ import net.minecraft.world.level.material.PushReaction; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.addons.oddities.block.be.MagnetBlockEntity; +import org.violetmoon.quark.addons.oddities.block.be.MagnetizedBlockBlockEntity; +import org.violetmoon.quark.addons.oddities.magnetsystem.MagnetSystem; +import org.violetmoon.quark.addons.oddities.module.MagnetsModule; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; public class MagnetBlock extends QuarkBlock implements EntityBlock { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/MatrixEnchantingTableBlock.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/MatrixEnchantingTableBlock.java index 44089d3633..c8cac11483 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/MatrixEnchantingTableBlock.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/MatrixEnchantingTableBlock.java @@ -1,20 +1,6 @@ package org.violetmoon.quark.addons.oddities.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; -import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; -import org.violetmoon.quark.api.IEnchantmentInfluencer; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.block.IQuarkBlock; -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.zeta.module.ZetaModule; - import com.mojang.math.Vector3f; - import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.core.particles.DustParticleOptions; @@ -41,6 +27,17 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; +import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; +import org.violetmoon.quark.api.IEnchantmentInfluencer; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.block.IQuarkBlock; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class MatrixEnchantingTableBlock extends EnchantmentTableBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/MovingMagnetizedBlock.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/MovingMagnetizedBlock.java index 008e2b6f52..41e1c68c17 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/MovingMagnetizedBlock.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/MovingMagnetizedBlock.java @@ -1,16 +1,5 @@ package org.violetmoon.quark.addons.oddities.block; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.addons.oddities.block.be.MagnetizedBlockBlockEntity; -import org.violetmoon.quark.addons.oddities.module.MagnetsModule; -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -19,11 +8,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.Mirror; -import net.minecraft.world.level.block.RenderShape; -import net.minecraft.world.level.block.Rotation; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -40,6 +25,15 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import org.violetmoon.quark.addons.oddities.block.be.MagnetizedBlockBlockEntity; +import org.violetmoon.quark.addons.oddities.module.MagnetsModule; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.List; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/TinyPotatoBlock.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/TinyPotatoBlock.java index 0ba9a84262..3ab104a7a8 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/TinyPotatoBlock.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/TinyPotatoBlock.java @@ -37,13 +37,8 @@ import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.addons.oddities.block.be.TinyPotatoBlockEntity; import org.violetmoon.quark.addons.oddities.item.TinyPotatoBlockItem; import org.violetmoon.quark.addons.oddities.module.TinyPotatoModule; @@ -52,6 +47,9 @@ import org.violetmoon.zeta.registry.IZetaBlockItemProvider; import org.violetmoon.zeta.util.ItemNBTHelper; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + /** * @author WireSegal * Created at 10:16 AM on 3/14/22. diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/AbstractEnchantingTableBlockEntity.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/AbstractEnchantingTableBlockEntity.java index 1326795388..1d0d5b0ab1 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/AbstractEnchantingTableBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/AbstractEnchantingTableBlockEntity.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.addons.oddities.block.be; -import java.util.Random; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.base.util.SimpleInventoryBlockEntity; - import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -20,6 +13,11 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.base.util.SimpleInventoryBlockEntity; + +import javax.annotation.Nonnull; +import java.util.Random; public abstract class AbstractEnchantingTableBlockEntity extends SimpleInventoryBlockEntity implements Nameable { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/CrateBlockEntity.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/CrateBlockEntity.java index 91350b107a..d0d3dd769b 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/CrateBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/CrateBlockEntity.java @@ -23,14 +23,13 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.block.CrateBlock; import org.violetmoon.quark.addons.oddities.capability.CrateItemHandler; import org.violetmoon.quark.addons.oddities.inventory.CrateMenu; import org.violetmoon.quark.addons.oddities.module.CrateModule; +import javax.annotation.Nonnull; + public class CrateBlockEntity extends BaseContainerBlockEntity implements WorldlyContainer { private int numPlayersUsing; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MagnetBlockEntity.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MagnetBlockEntity.java index 22282c0282..9ca1af0a5f 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MagnetBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MagnetBlockEntity.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.addons.oddities.block.be; -import org.violetmoon.quark.addons.oddities.block.MagnetBlock; -import org.violetmoon.quark.addons.oddities.magnetsystem.MagnetSystem; -import org.violetmoon.quark.addons.oddities.module.MagnetsModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; @@ -12,6 +8,9 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.PushReaction; +import org.violetmoon.quark.addons.oddities.block.MagnetBlock; +import org.violetmoon.quark.addons.oddities.magnetsystem.MagnetSystem; +import org.violetmoon.quark.addons.oddities.module.MagnetsModule; public class MagnetBlockEntity extends BlockEntity { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MagnetizedBlockBlockEntity.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MagnetizedBlockBlockEntity.java index e875ddb6f4..bf18248b83 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MagnetizedBlockBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MagnetizedBlockBlockEntity.java @@ -11,7 +11,10 @@ import net.minecraft.world.entity.MoverType; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.BasePressurePlateBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.ButtonBlock; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -22,14 +25,12 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.magnetsystem.MagnetSystem; import org.violetmoon.quark.addons.oddities.module.MagnetsModule; import org.violetmoon.quark.api.IMagnetMoveAction; import org.violetmoon.quark.base.Quark; +import javax.annotation.Nonnull; import java.util.List; public class MagnetizedBlockBlockEntity extends BlockEntity { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MatrixEnchantingTableBlockEntity.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MatrixEnchantingTableBlockEntity.java index d617902e22..643beef09f 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MatrixEnchantingTableBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/MatrixEnchantingTableBlockEntity.java @@ -1,25 +1,6 @@ package org.violetmoon.quark.addons.oddities.block.be; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; -import java.util.function.Predicate; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.addons.oddities.inventory.EnchantmentMatrix; -import org.violetmoon.quark.addons.oddities.inventory.MatrixEnchantingMenu; -import org.violetmoon.quark.addons.oddities.inventory.EnchantmentMatrix.Piece; -import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; -import org.violetmoon.quark.addons.oddities.util.Influence; -import org.violetmoon.quark.api.IEnchantmentInfluencer; -import org.violetmoon.zeta.util.ItemNBTHelper; - import com.google.common.collect.Lists; - import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; import net.minecraft.core.particles.ParticleOptions; @@ -48,6 +29,22 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; +import org.violetmoon.quark.addons.oddities.inventory.EnchantmentMatrix; +import org.violetmoon.quark.addons.oddities.inventory.EnchantmentMatrix.Piece; +import org.violetmoon.quark.addons.oddities.inventory.MatrixEnchantingMenu; +import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; +import org.violetmoon.quark.addons.oddities.util.Influence; +import org.violetmoon.quark.api.IEnchantmentInfluencer; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; +import java.util.function.Predicate; public class MatrixEnchantingTableBlockEntity extends AbstractEnchantingTableBlockEntity implements MenuProvider { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/PipeBlockEntity.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/PipeBlockEntity.java index 06340e70a4..c44617a3dc 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/PipeBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/PipeBlockEntity.java @@ -29,9 +29,6 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.capabilities.ForgeCapabilities; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.block.pipe.BasePipeBlock; import org.violetmoon.quark.addons.oddities.module.PipesModule; import org.violetmoon.quark.base.client.handler.NetworkProfilingHandler; @@ -39,6 +36,7 @@ import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.base.util.SimpleInventoryBlockEntity; +import javax.annotation.Nonnull; import java.util.*; import java.util.function.Predicate; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/TinyPotatoBlockEntity.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/TinyPotatoBlockEntity.java index ad201a18fe..520c59debc 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/be/TinyPotatoBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/be/TinyPotatoBlockEntity.java @@ -17,10 +17,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.addons.oddities.block.TinyPotatoBlock; import org.violetmoon.quark.addons.oddities.module.TinyPotatoModule; import org.violetmoon.quark.addons.oddities.util.TinyPotatoInfo; @@ -28,6 +24,8 @@ import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.base.util.SimpleInventoryBlockEntity; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/BasePipeBlock.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/BasePipeBlock.java index d9be172c27..c5bd794a3a 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/BasePipeBlock.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/BasePipeBlock.java @@ -30,12 +30,11 @@ import org.violetmoon.zeta.registry.RenderLayerRegistry; import javax.annotation.Nonnull; - -import static org.violetmoon.quark.base.handler.MiscUtil.directionProperty; - import java.util.HashSet; import java.util.Set; +import static org.violetmoon.quark.base.handler.MiscUtil.directionProperty; + public abstract class BasePipeBlock extends QuarkBlock implements EntityBlock { protected static final BooleanProperty DOWN = BlockStateProperties.DOWN; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/EncasedPipeBlock.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/EncasedPipeBlock.java index bf80eeb8c8..223a882738 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/EncasedPipeBlock.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/EncasedPipeBlock.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.addons.oddities.block.pipe; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.block.be.PipeBlockEntity.ConnectionType; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.BlockAndTintGetter; @@ -17,6 +12,10 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.addons.oddities.block.be.PipeBlockEntity.ConnectionType; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class EncasedPipeBlock extends BasePipeBlock { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/PipeBlock.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/PipeBlock.java index 7c88407de1..7d2eeded36 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/PipeBlock.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/pipe/PipeBlock.java @@ -28,15 +28,14 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; - -import static org.violetmoon.quark.base.handler.MiscUtil.directionProperty; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.block.be.PipeBlockEntity; import org.violetmoon.quark.addons.oddities.module.PipesModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + +import static org.violetmoon.quark.base.handler.MiscUtil.directionProperty; + public class PipeBlock extends BasePipeBlock implements SimpleWaterloggedBlock { private static final VoxelShape CENTER_SHAPE = Shapes.box(0.3125, 0.3125, 0.3125, 0.6875, 0.6875, 0.6875); diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/capability/CrateItemHandler.java b/src/main/java/org/violetmoon/quark/addons/oddities/capability/CrateItemHandler.java index 964ababaa8..4a9ea2fcdf 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/capability/CrateItemHandler.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/capability/CrateItemHandler.java @@ -10,14 +10,13 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraftforge.items.ItemStackHandler; - -import java.util.ArrayList; -import java.util.List; - import org.jetbrains.annotations.NotNull; import org.violetmoon.quark.addons.oddities.module.CrateModule; import org.violetmoon.quark.base.handler.SortingHandler; +import java.util.ArrayList; +import java.util.List; + /** * @author WireSegal * Created at 8:53 AM on 4/8/22. diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/capability/MagnetTracker.java b/src/main/java/org/violetmoon/quark/addons/oddities/capability/MagnetTracker.java index d45f001bb6..194f8f977a 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/capability/MagnetTracker.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/capability/MagnetTracker.java @@ -7,11 +7,10 @@ import net.minecraft.core.Vec3i; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.api.IMagnetTracker; import java.util.Collection; -import org.violetmoon.quark.api.IMagnetTracker; - /** * @author WireSegal * Created at 4:29 PM on 3/1/20. diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/model/BackpackModel.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/model/BackpackModel.java index 4476c24118..7659fc4bd9 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/model/BackpackModel.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/model/BackpackModel.java @@ -1,13 +1,12 @@ package org.violetmoon.quark.addons.oddities.client.model; -import org.violetmoon.quark.base.client.render.QuarkArmorModel; - import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.builders.CubeListBuilder; import net.minecraft.client.model.geom.builders.LayerDefinition; import net.minecraft.client.model.geom.builders.PartDefinition; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.client.render.QuarkArmorModel; @OnlyIn(Dist.CLIENT) public class BackpackModel { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/model/TinyPotatoModel.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/model/TinyPotatoModel.java index 0efe3e0bdb..71fc44e992 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/model/TinyPotatoModel.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/model/TinyPotatoModel.java @@ -1,13 +1,5 @@ package org.violetmoon.quark.addons.oddities.client.model; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.addons.oddities.block.TinyPotatoBlock; -import org.violetmoon.quark.addons.oddities.client.render.be.TinyPotatoRenderer; - import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemOverrides; @@ -21,6 +13,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.addons.oddities.block.TinyPotatoBlock; +import org.violetmoon.quark.addons.oddities.client.render.be.TinyPotatoRenderer; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; @OnlyIn(Dist.CLIENT) public record TinyPotatoModel(BakedModel originalModel) implements BakedModel { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/MagnetizedBlockRenderer.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/MagnetizedBlockRenderer.java index 7ed7c3a4e1..e8e1baba16 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/MagnetizedBlockRenderer.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/MagnetizedBlockRenderer.java @@ -1,12 +1,6 @@ package org.violetmoon.quark.addons.oddities.client.render.be; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.block.be.MagnetizedBlockBlockEntity; -import org.violetmoon.quark.content.automation.client.render.QuarkPistonBlockEntityRenderer; - import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.BlockRenderDispatcher; @@ -23,6 +17,10 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.ForgeHooksClient; +import org.violetmoon.quark.addons.oddities.block.be.MagnetizedBlockBlockEntity; +import org.violetmoon.quark.content.automation.client.render.QuarkPistonBlockEntityRenderer; + +import javax.annotation.Nonnull; @OnlyIn(Dist.CLIENT) public class MagnetizedBlockRenderer implements BlockEntityRenderer { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/MatrixEnchantingTableRenderer.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/MatrixEnchantingTableRenderer.java index 0aa4a70bbb..3a464a2172 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/MatrixEnchantingTableRenderer.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/MatrixEnchantingTableRenderer.java @@ -3,7 +3,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Vector3f; - import net.minecraft.client.Minecraft; import net.minecraft.client.model.BookModel; import net.minecraft.client.model.geom.ModelLayers; @@ -17,11 +16,10 @@ import net.minecraft.client.resources.model.Material; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; +import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; import javax.annotation.Nonnull; -import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; - public class MatrixEnchantingTableRenderer implements BlockEntityRenderer { public static final Material TEXTURE_BOOK = EnchantTableRenderer.BOOK_LOCATION; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/PipeRenderer.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/PipeRenderer.java index 4647e1a2f4..da9c273f89 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/PipeRenderer.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/PipeRenderer.java @@ -1,20 +1,7 @@ package org.violetmoon.quark.addons.oddities.client.render.be; -import java.util.Iterator; -import java.util.Random; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.block.be.PipeBlockEntity; -import org.violetmoon.quark.addons.oddities.block.be.PipeBlockEntity.ConnectionType; -import org.violetmoon.quark.addons.oddities.block.be.PipeBlockEntity.PipeItem; -import org.violetmoon.quark.addons.oddities.block.pipe.PipeBlock; -import org.violetmoon.quark.addons.oddities.module.PipesModule; -import org.violetmoon.quark.base.Quark; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.Sheets; @@ -31,6 +18,15 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import org.violetmoon.quark.addons.oddities.block.be.PipeBlockEntity; +import org.violetmoon.quark.addons.oddities.block.be.PipeBlockEntity.ConnectionType; +import org.violetmoon.quark.addons.oddities.block.be.PipeBlockEntity.PipeItem; +import org.violetmoon.quark.addons.oddities.module.PipesModule; +import org.violetmoon.quark.base.Quark; + +import javax.annotation.Nonnull; +import java.util.Iterator; +import java.util.Random; public class PipeRenderer implements BlockEntityRenderer { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/TinyPotatoRenderer.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/TinyPotatoRenderer.java index 1887e31c99..fdb44a7a18 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/TinyPotatoRenderer.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/TinyPotatoRenderer.java @@ -26,9 +26,6 @@ import net.minecraft.world.phys.HitResult; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.block.be.TinyPotatoBlockEntity; import org.violetmoon.quark.addons.oddities.module.TinyPotatoModule; import org.violetmoon.quark.addons.oddities.util.TinyPotatoInfo; @@ -36,6 +33,7 @@ import org.violetmoon.quark.content.tools.module.ColorRunesModule; import org.violetmoon.quark.mixin.client.accessor.AccessorModelManager; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Calendar; import java.util.List; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/entity/TotemOfHoldingRenderer.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/entity/TotemOfHoldingRenderer.java index 7a839408db..27fddd844e 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/entity/TotemOfHoldingRenderer.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/entity/TotemOfHoldingRenderer.java @@ -1,14 +1,7 @@ package org.violetmoon.quark.addons.oddities.client.render.entity; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.entity.TotemOfHoldingEntity; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.QuarkClient; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.Sheets; @@ -25,6 +18,11 @@ import net.minecraft.world.phys.HitResult; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.addons.oddities.entity.TotemOfHoldingEntity; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.QuarkClient; + +import javax.annotation.Nonnull; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/BackpackInventoryScreen.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/BackpackInventoryScreen.java index 56b0739967..86b232ba49 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/BackpackInventoryScreen.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/BackpackInventoryScreen.java @@ -13,15 +13,13 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.item.ItemStack; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.inventory.BackpackMenu; import org.violetmoon.quark.addons.oddities.module.BackpackModule; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.network.QuarkNetwork; import org.violetmoon.quark.base.network.message.oddities.HandleBackpackMessage; +import javax.annotation.Nonnull; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/CrateScreen.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/CrateScreen.java index 464e6a7df3..31817354e4 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/CrateScreen.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/CrateScreen.java @@ -1,27 +1,24 @@ package org.violetmoon.quark.addons.oddities.client.screen; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.inventory.CrateMenu; -import org.violetmoon.quark.addons.oddities.module.CrateModule; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.client.handler.InventoryButtonHandler; -import org.violetmoon.quark.base.client.handler.InventoryButtonHandler.ButtonTargetType; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.content.client.module.ChestSearchingModule; - import com.google.common.collect.Lists; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.Rect2i; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; +import org.violetmoon.quark.addons.oddities.inventory.CrateMenu; +import org.violetmoon.quark.addons.oddities.module.CrateModule; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.client.handler.InventoryButtonHandler; +import org.violetmoon.quark.base.client.handler.InventoryButtonHandler.ButtonTargetType; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.content.client.module.ChestSearchingModule; + +import javax.annotation.Nonnull; +import java.util.List; public class CrateScreen extends AbstractContainerScreen { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPieceList.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPieceList.java index a2dc3e0b13..76a51a3c36 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPieceList.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPieceList.java @@ -7,11 +7,10 @@ import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.util.Mth; +import org.violetmoon.quark.addons.oddities.inventory.EnchantmentMatrix.Piece; import javax.annotation.Nonnull; -import org.violetmoon.quark.addons.oddities.inventory.EnchantmentMatrix.Piece; - public class MatrixEnchantingPieceList extends ObjectSelectionList { private final MatrixEnchantingScreen parent; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPlusButton.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPlusButton.java index 4d711e893c..bc37a324f6 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPlusButton.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPlusButton.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.addons.oddities.client.screen; -import javax.annotation.Nonnull; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.gui.components.Button; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; +import javax.annotation.Nonnull; + public class MatrixEnchantingPlusButton extends Button { public MatrixEnchantingPlusButton(int x, int y, OnPress onPress) { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingScreen.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingScreen.java index be6c2a9d5d..e0614ee7b6 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingScreen.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingScreen.java @@ -1,24 +1,7 @@ package org.violetmoon.quark.addons.oddities.client.screen; -import java.util.LinkedList; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; -import org.violetmoon.quark.addons.oddities.inventory.EnchantmentMatrix; -import org.violetmoon.quark.addons.oddities.inventory.MatrixEnchantingMenu; -import org.violetmoon.quark.addons.oddities.inventory.EnchantmentMatrix.Piece; -import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.QuarkClient; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.base.network.QuarkNetwork; -import org.violetmoon.quark.base.network.message.oddities.MatrixEnchanterOperationMessage; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; @@ -30,6 +13,20 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.player.Inventory; +import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; +import org.violetmoon.quark.addons.oddities.inventory.EnchantmentMatrix; +import org.violetmoon.quark.addons.oddities.inventory.EnchantmentMatrix.Piece; +import org.violetmoon.quark.addons.oddities.inventory.MatrixEnchantingMenu; +import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.QuarkClient; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.base.network.QuarkNetwork; +import org.violetmoon.quark.base.network.message.oddities.MatrixEnchanterOperationMessage; + +import javax.annotation.Nonnull; +import java.util.LinkedList; +import java.util.List; public class MatrixEnchantingScreen extends AbstractContainerScreen { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/entity/TotemOfHoldingEntity.java b/src/main/java/org/violetmoon/quark/addons/oddities/entity/TotemOfHoldingEntity.java index 6f072563f9..566ecb2760 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/entity/TotemOfHoldingEntity.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/entity/TotemOfHoldingEntity.java @@ -1,13 +1,5 @@ package org.violetmoon.quark.addons.oddities.entity; -import java.util.LinkedList; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.item.BackpackItem; -import org.violetmoon.quark.addons.oddities.module.TotemOfHoldingModule; - import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -26,6 +18,12 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Level; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.addons.oddities.item.BackpackItem; +import org.violetmoon.quark.addons.oddities.module.TotemOfHoldingModule; + +import javax.annotation.Nonnull; +import java.util.LinkedList; +import java.util.List; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/BackpackMenu.java b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/BackpackMenu.java index 2dde74ef7d..0b7c2bfe6f 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/BackpackMenu.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/BackpackMenu.java @@ -8,14 +8,13 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.*; import net.minecraft.world.item.ItemStack; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.inventory.slot.BackpackSlot; import org.violetmoon.quark.addons.oddities.inventory.slot.CachedItemHandlerSlot; import org.violetmoon.quark.addons.oddities.module.BackpackModule; import org.violetmoon.quark.base.util.InventoryIIH; +import javax.annotation.Nonnull; + public class BackpackMenu extends InventoryMenu { public BackpackMenu(int windowId, Player player) { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/CrateMenu.java b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/CrateMenu.java index 60c7e5ee1c..15b9f4865a 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/CrateMenu.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/CrateMenu.java @@ -11,15 +11,14 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.SlotItemHandler; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.block.be.CrateBlockEntity; import org.violetmoon.quark.addons.oddities.capability.CrateItemHandler; import org.violetmoon.quark.addons.oddities.module.CrateModule; import org.violetmoon.quark.base.network.QuarkNetwork; import org.violetmoon.quark.base.network.message.oddities.ScrollCrateMessage; +import javax.annotation.Nonnull; + public class CrateMenu extends AbstractContainerMenu { public final CrateBlockEntity crate; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/EnchantmentMatrix.java b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/EnchantmentMatrix.java index 8ec6c8fab6..598101818c 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/EnchantmentMatrix.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/EnchantmentMatrix.java @@ -13,12 +13,10 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentInstance; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; import org.violetmoon.quark.content.experimental.module.EnchantmentsBegoneModule; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; import java.util.*; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/MatrixEnchantingMenu.java b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/MatrixEnchantingMenu.java index 6878bd5b0e..8efb3ea128 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/MatrixEnchantingMenu.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/MatrixEnchantingMenu.java @@ -14,12 +14,11 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraftforge.common.Tags; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; +import javax.annotation.Nonnull; + public class MatrixEnchantingMenu extends AbstractContainerMenu { public final MatrixEnchantingTableBlockEntity enchanter; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/slot/BackpackSlot.java b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/slot/BackpackSlot.java index ef1de04a6d..b1e06443ce 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/slot/BackpackSlot.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/slot/BackpackSlot.java @@ -1,10 +1,9 @@ package org.violetmoon.quark.addons.oddities.inventory.slot; -import org.jetbrains.annotations.NotNull; -import org.violetmoon.quark.addons.oddities.module.BackpackModule; - import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.IItemHandler; +import org.jetbrains.annotations.NotNull; +import org.violetmoon.quark.addons.oddities.module.BackpackModule; public class BackpackSlot extends CachedItemHandlerSlot { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/slot/SlotCachingItemHandler.java b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/slot/SlotCachingItemHandler.java index e88772824b..e3e3b4f580 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/slot/SlotCachingItemHandler.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/slot/SlotCachingItemHandler.java @@ -1,6 +1,5 @@ package org.violetmoon.quark.addons.oddities.inventory.slot; -import com.google.common.cache.Cache; import net.minecraftforge.items.IItemHandler; @Deprecated(forRemoval = true) diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/item/BackpackItem.java b/src/main/java/org/violetmoon/quark/addons/oddities/item/BackpackItem.java index 9b698d85db..35d5d54d5e 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/item/BackpackItem.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/item/BackpackItem.java @@ -1,24 +1,7 @@ package org.violetmoon.quark.addons.oddities.item; -import java.util.Map; -import java.util.function.BooleanSupplier; -import java.util.function.Consumer; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.inventory.BackpackMenu; -import org.violetmoon.quark.addons.oddities.module.BackpackModule; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.client.handler.ModelHandler; -import org.violetmoon.quark.base.client.handler.RequiredModTooltipHandler; -import org.violetmoon.quark.base.handler.ProxiedItemStackHandler; -import org.violetmoon.zeta.item.IZetaItem; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.ItemNBTHelper; - import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; - import net.minecraft.client.model.HumanoidModel; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; @@ -34,12 +17,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.ArmorMaterials; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.DyeableArmorItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.*; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; @@ -52,6 +30,20 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemStackHandler; +import org.violetmoon.quark.addons.oddities.inventory.BackpackMenu; +import org.violetmoon.quark.addons.oddities.module.BackpackModule; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.client.handler.ModelHandler; +import org.violetmoon.quark.base.client.handler.RequiredModTooltipHandler; +import org.violetmoon.quark.base.handler.ProxiedItemStackHandler; +import org.violetmoon.zeta.item.IZetaItem; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; +import java.util.Map; +import java.util.function.BooleanSupplier; +import java.util.function.Consumer; public class BackpackItem extends DyeableArmorItem implements IZetaItem, MenuProvider { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/item/TinyPotatoBlockItem.java b/src/main/java/org/violetmoon/quark/addons/oddities/item/TinyPotatoBlockItem.java index cbdaf15a67..e49076368c 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/item/TinyPotatoBlockItem.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/item/TinyPotatoBlockItem.java @@ -1,16 +1,5 @@ package org.violetmoon.quark.addons.oddities.item; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.block.TinyPotatoBlock; -import org.violetmoon.quark.addons.oddities.block.be.TinyPotatoBlockEntity; -import org.violetmoon.quark.addons.oddities.util.TinyPotatoInfo; -import org.violetmoon.quark.api.IRuneColorProvider; -import org.violetmoon.quark.base.handler.ContributorRewardHandler; -import org.violetmoon.zeta.util.ItemNBTHelper; - import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; @@ -23,6 +12,15 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; +import org.violetmoon.quark.addons.oddities.block.TinyPotatoBlock; +import org.violetmoon.quark.addons.oddities.block.be.TinyPotatoBlockEntity; +import org.violetmoon.quark.addons.oddities.util.TinyPotatoInfo; +import org.violetmoon.quark.api.IRuneColorProvider; +import org.violetmoon.quark.base.handler.ContributorRewardHandler; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; +import java.util.List; public class TinyPotatoBlockItem extends BlockItem implements IRuneColorProvider { private static final int NOT_MY_NAME = 17; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/DefaultMoveActions.java b/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/DefaultMoveActions.java index 24fd99c29e..4199777895 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/DefaultMoveActions.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/DefaultMoveActions.java @@ -15,11 +15,10 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.IPlantable; +import org.violetmoon.quark.api.IMagnetMoveAction; import java.util.HashMap; -import org.violetmoon.quark.api.IMagnetMoveAction; - public class DefaultMoveActions { public static void addActions(HashMap map) { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/MagnetSystem.java b/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/MagnetSystem.java index 632b16b278..06c7a1be65 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/MagnetSystem.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/MagnetSystem.java @@ -1,8 +1,5 @@ package org.violetmoon.quark.addons.oddities.magnetsystem; -import java.util.HashMap; -import java.util.HashSet; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.BlockItem; @@ -21,6 +18,9 @@ import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.RecipeCrawlHandler; +import java.util.HashMap; +import java.util.HashSet; + public class MagnetSystem { private static final HashSet magnetizableBlocks = new HashSet<>(); diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/BackpackModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/BackpackModule.java index bc551a4679..425020a78a 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/BackpackModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/BackpackModule.java @@ -1,27 +1,5 @@ package org.violetmoon.quark.addons.oddities.module; -import org.violetmoon.quark.addons.oddities.client.screen.BackpackInventoryScreen; -import org.violetmoon.quark.addons.oddities.inventory.BackpackMenu; -import org.violetmoon.quark.addons.oddities.item.BackpackItem; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.item.QuarkItem; -import org.violetmoon.quark.base.network.QuarkNetwork; -import org.violetmoon.quark.base.network.message.oddities.HandleBackpackMessage; -import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers; -import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.client.event.play.ZScreen; -import org.violetmoon.zeta.client.event.play.ZStartClientTick; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZCommonSetup; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.event.play.entity.living.ZLivingDrops; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.client.Minecraft; import net.minecraft.client.color.item.ItemColor; import net.minecraft.client.gui.screens.MenuScreens; @@ -40,16 +18,32 @@ import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.DyeableArmorItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.*; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; import net.minecraftforge.common.extensions.IForgeMenuType; +import org.violetmoon.quark.addons.oddities.client.screen.BackpackInventoryScreen; +import org.violetmoon.quark.addons.oddities.inventory.BackpackMenu; +import org.violetmoon.quark.addons.oddities.item.BackpackItem; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.item.QuarkItem; +import org.violetmoon.quark.base.network.QuarkNetwork; +import org.violetmoon.quark.base.network.message.oddities.HandleBackpackMessage; +import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers; +import org.violetmoon.zeta.client.event.load.ZClientSetup; +import org.violetmoon.zeta.client.event.play.ZScreen; +import org.violetmoon.zeta.client.event.play.ZStartClientTick; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZCommonSetup; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.event.play.entity.living.ZLivingDrops; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; @ZetaLoadModule(category = "oddities") public class BackpackModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/CrateModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/CrateModule.java index 5b54ef03bf..6adbcab7e1 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/CrateModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/CrateModule.java @@ -1,5 +1,11 @@ package org.violetmoon.quark.addons.oddities.module; +import net.minecraft.client.gui.screens.MenuScreens; +import net.minecraft.core.Registry; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraftforge.common.extensions.IForgeMenuType; import org.violetmoon.quark.addons.oddities.block.CrateBlock; import org.violetmoon.quark.addons.oddities.block.be.CrateBlockEntity; import org.violetmoon.quark.addons.oddities.client.screen.CrateScreen; @@ -13,13 +19,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.gui.screens.MenuScreens; -import net.minecraft.core.Registry; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.common.extensions.IForgeMenuType; - @ZetaLoadModule(category = "oddities") public class CrateModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java index 2ec8e267b5..7449d0d0da 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java @@ -6,9 +6,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.eventbus.api.SubscribeEvent; - -import java.util.List; - import org.violetmoon.quark.addons.oddities.block.MagnetBlock; import org.violetmoon.quark.addons.oddities.block.MovingMagnetizedBlock; import org.violetmoon.quark.addons.oddities.block.be.MagnetBlockEntity; @@ -27,6 +24,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.List; + @ZetaLoadModule(category = "oddities") public class MagnetsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java index 86c69482d2..f7b17d0160 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java @@ -19,12 +19,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.extensions.IForgeMenuType; import net.minecraftforge.common.util.FakePlayer; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.violetmoon.quark.addons.oddities.block.MatrixEnchantingTableBlock; import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; import org.violetmoon.quark.addons.oddities.client.render.be.MatrixEnchantingTableRenderer; @@ -38,7 +32,6 @@ import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; import org.violetmoon.quark.base.handler.advancement.QuarkGenericTrigger; import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.event.*; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.load.ZConfigChanged; @@ -51,6 +44,11 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.ItemNBTHelper; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + @ZetaLoadModule(category = "oddities") public class MatrixEnchantingModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/PipesModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/PipesModule.java index e371022f50..e60665a408 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/PipesModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/PipesModule.java @@ -1,5 +1,13 @@ package org.violetmoon.quark.addons.oddities.module; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntityType; import org.violetmoon.quark.addons.oddities.block.be.PipeBlockEntity; import org.violetmoon.quark.addons.oddities.block.pipe.EncasedPipeBlock; import org.violetmoon.quark.addons.oddities.block.pipe.PipeBlock; @@ -16,15 +24,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; - @ZetaLoadModule(category = "oddities") public class PipesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java index 7fc4b17f48..f430e3787a 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java @@ -10,11 +10,6 @@ import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; - -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - import org.violetmoon.quark.addons.oddities.block.TinyPotatoBlock; import org.violetmoon.quark.addons.oddities.block.be.TinyPotatoBlockEntity; import org.violetmoon.quark.addons.oddities.client.model.TinyPotatoModel; @@ -32,6 +27,10 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + @ZetaLoadModule(category = "oddities", antiOverlap = "botania") public class TinyPotatoModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/TotemOfHoldingModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/TotemOfHoldingModule.java index 17236486c4..3b75d75a56 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/TotemOfHoldingModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/TotemOfHoldingModule.java @@ -10,10 +10,6 @@ import net.minecraft.world.entity.MobCategory; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; - -import java.util.Collection; -import java.util.Objects; - import org.violetmoon.quark.addons.oddities.client.render.entity.TotemOfHoldingRenderer; import org.violetmoon.quark.addons.oddities.entity.TotemOfHoldingEntity; import org.violetmoon.quark.base.Quark; @@ -27,6 +23,9 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.Collection; +import java.util.Objects; + /** * @author WireSegal * Created at 1:21 PM on 3/30/20. diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/util/CustomInfluence.java b/src/main/java/org/violetmoon/quark/addons/oddities/util/CustomInfluence.java index 990f01aa87..eecf5d0b7a 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/util/CustomInfluence.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/util/CustomInfluence.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.addons.oddities.util; -import org.violetmoon.quark.api.IEnchantmentInfluencer; - import net.minecraft.core.BlockPos; import net.minecraft.util.FastColor; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.api.IEnchantmentInfluencer; public record CustomInfluence(int strength, int color, Influence influence) implements IEnchantmentInfluencer { @Override diff --git a/src/main/java/org/violetmoon/quark/api/IAdvancementModifier.java b/src/main/java/org/violetmoon/quark/api/IAdvancementModifier.java index a57070b0f8..e6e46bb586 100644 --- a/src/main/java/org/violetmoon/quark/api/IAdvancementModifier.java +++ b/src/main/java/org/violetmoon/quark/api/IAdvancementModifier.java @@ -1,11 +1,10 @@ package org.violetmoon.quark.api; -import java.util.Set; - import com.google.common.base.Supplier; - import net.minecraft.resources.ResourceLocation; +import java.util.Set; + public interface IAdvancementModifier { Set getTargets(); diff --git a/src/main/java/org/violetmoon/quark/api/IAdvancementModifierDelegate.java b/src/main/java/org/violetmoon/quark/api/IAdvancementModifierDelegate.java index 19534d3903..c9c0209549 100644 --- a/src/main/java/org/violetmoon/quark/api/IAdvancementModifierDelegate.java +++ b/src/main/java/org/violetmoon/quark/api/IAdvancementModifierDelegate.java @@ -1,8 +1,5 @@ package org.violetmoon.quark.api; -import java.util.Set; -import java.util.function.BooleanSupplier; - import net.minecraft.resources.ResourceKey; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.entity.EntityType; @@ -11,6 +8,9 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Block; +import java.util.Set; +import java.util.function.BooleanSupplier; + public interface IAdvancementModifierDelegate { IAdvancementModifier createAdventuringTimeMod(Set> locations); IAdvancementModifier createBalancedDietMod(Set items); diff --git a/src/main/java/org/violetmoon/quark/api/ICustomSorting.java b/src/main/java/org/violetmoon/quark/api/ICustomSorting.java index 0568456c0f..47e7c7ffaf 100644 --- a/src/main/java/org/violetmoon/quark/api/ICustomSorting.java +++ b/src/main/java/org/violetmoon/quark/api/ICustomSorting.java @@ -1,9 +1,9 @@ package org.violetmoon.quark.api; -import java.util.Comparator; - import net.minecraft.world.item.ItemStack; +import java.util.Comparator; + public interface ICustomSorting { /** diff --git a/src/main/java/org/violetmoon/quark/api/ITransferManager.java b/src/main/java/org/violetmoon/quark/api/ITransferManager.java index ac243b92b2..18bf5d32bf 100644 --- a/src/main/java/org/violetmoon/quark/api/ITransferManager.java +++ b/src/main/java/org/violetmoon/quark/api/ITransferManager.java @@ -10,11 +10,11 @@ */ package org.violetmoon.quark.api; -import java.util.function.Supplier; - import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.IItemHandler; +import java.util.function.Supplier; + /** * Implement on a TileEntity or provide as a capability * to allow it to receive inventory transfering, and to have chest buttons diff --git a/src/main/java/org/violetmoon/quark/api/IUsageTickerOverride.java b/src/main/java/org/violetmoon/quark/api/IUsageTickerOverride.java index 76c7d71061..8d541cd8aa 100644 --- a/src/main/java/org/violetmoon/quark/api/IUsageTickerOverride.java +++ b/src/main/java/org/violetmoon/quark/api/IUsageTickerOverride.java @@ -1,9 +1,9 @@ package org.violetmoon.quark.api; -import java.util.function.Predicate; - import net.minecraft.world.item.ItemStack; +import java.util.function.Predicate; + /** * Implement this on an Item to change its behavior with the quark usage ticker. */ diff --git a/src/main/java/org/violetmoon/quark/api/event/GatherAdvancementModifiersEvent.java b/src/main/java/org/violetmoon/quark/api/event/GatherAdvancementModifiersEvent.java index 6d86ac70dc..fc6cd51530 100644 --- a/src/main/java/org/violetmoon/quark/api/event/GatherAdvancementModifiersEvent.java +++ b/src/main/java/org/violetmoon/quark/api/event/GatherAdvancementModifiersEvent.java @@ -8,14 +8,13 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Block; import net.minecraftforge.eventbus.api.Event; +import org.violetmoon.quark.api.IAdvancementModifier; +import org.violetmoon.quark.api.IAdvancementModifierDelegate; import java.util.HashSet; import java.util.Set; import java.util.function.BooleanSupplier; -import org.violetmoon.quark.api.IAdvancementModifier; -import org.violetmoon.quark.api.IAdvancementModifierDelegate; - public class GatherAdvancementModifiersEvent extends Event implements IAdvancementModifierDelegate{ private final IAdvancementModifierDelegate delegate; diff --git a/src/main/java/org/violetmoon/quark/api/event/GatherToolClassesEvent.java b/src/main/java/org/violetmoon/quark/api/event/GatherToolClassesEvent.java index ef5c58b326..d24ec18e88 100644 --- a/src/main/java/org/violetmoon/quark/api/event/GatherToolClassesEvent.java +++ b/src/main/java/org/violetmoon/quark/api/event/GatherToolClassesEvent.java @@ -1,10 +1,10 @@ package org.violetmoon.quark.api.event; -import java.util.Set; - import net.minecraft.world.item.ItemStack; import net.minecraftforge.eventbus.api.Event; +import java.util.Set; + public class GatherToolClassesEvent extends Event { public final ItemStack stack; diff --git a/src/main/java/org/violetmoon/quark/api/event/RecipeCrawlEvent.java b/src/main/java/org/violetmoon/quark/api/event/RecipeCrawlEvent.java index 3528dd03a5..27ba8e420b 100644 --- a/src/main/java/org/violetmoon/quark/api/event/RecipeCrawlEvent.java +++ b/src/main/java/org/violetmoon/quark/api/event/RecipeCrawlEvent.java @@ -1,21 +1,15 @@ package org.violetmoon.quark.api.event; -import java.util.Collection; - import com.google.common.collect.Multimap; - import net.minecraft.core.NonNullList; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.AbstractCookingRecipe; -import net.minecraft.world.item.crafting.CustomRecipe; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.Recipe; -import net.minecraft.world.item.crafting.ShapedRecipe; -import net.minecraft.world.item.crafting.ShapelessRecipe; +import net.minecraft.world.item.crafting.*; import net.minecraftforge.eventbus.api.Event; +import java.util.Collection; + public abstract class RecipeCrawlEvent extends Event { public static class Reset extends RecipeCrawlEvent {} diff --git a/src/main/java/org/violetmoon/quark/base/Quark.java b/src/main/java/org/violetmoon/quark/base/Quark.java index 0dbbab868a..bfc38cfa29 100644 --- a/src/main/java/org/violetmoon/quark/base/Quark.java +++ b/src/main/java/org/violetmoon/quark/base/Quark.java @@ -2,7 +2,6 @@ import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.violetmoon.quark.base.proxy.ClientProxy; diff --git a/src/main/java/org/violetmoon/quark/base/block/IQuarkBlock.java b/src/main/java/org/violetmoon/quark/base/block/IQuarkBlock.java index 4d1d4deb1a..11494ad9af 100644 --- a/src/main/java/org/violetmoon/quark/base/block/IQuarkBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/IQuarkBlock.java @@ -9,13 +9,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.material.Material; - -import java.util.function.Function; - import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.block.ext.IZetaBlockExtensions; import org.violetmoon.zeta.module.IDisableable; +import java.util.function.Function; + /** * @author WireSegal * Created at 1:14 PM on 9/19/19. diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkBlock.java index d4da01c571..73a9a3d518 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkBlock.java @@ -7,15 +7,13 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.client.handler.RequiredModTooltipHandler; import org.violetmoon.quark.base.handler.CreativeTabHandler; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.BooleanSupplier; public class QuarkBlock extends Block implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkBlockWrapper.java b/src/main/java/org/violetmoon/quark/base/block/QuarkBlockWrapper.java index b6a02f1327..dde5bc4b20 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkBlockWrapper.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkBlockWrapper.java @@ -1,10 +1,9 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - +import net.minecraft.world.level.block.Block; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.level.block.Block; +import java.util.function.BooleanSupplier; // Wrapper to allow vanilla blocks to be treated as quark blocks contextualized under a module public class QuarkBlockWrapper implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkBushBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkBushBlock.java index a996e2fd83..b0c23f90c4 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkBushBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkBushBlock.java @@ -1,19 +1,17 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - +import net.minecraft.core.NonNullList; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.BushBlock; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.CreativeTabHandler; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.RenderLayerRegistry; -import net.minecraft.core.NonNullList; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.BushBlock; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class QuarkBushBlock extends BushBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkButtonBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkButtonBlock.java index 11b2f61fc5..eb06d828c3 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkButtonBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkButtonBlock.java @@ -5,14 +5,12 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.ButtonBlock; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.CreativeTabHandler; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.BooleanSupplier; /** diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkDoorBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkDoorBlock.java index b870e91052..43e018c4b3 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkDoorBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkDoorBlock.java @@ -1,16 +1,5 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.quark.base.item.QuarkDoubleHighBlockItem; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.IZetaBlockItemProvider; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.NonNullList; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.CreativeModeTab; @@ -18,6 +7,15 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DoorBlock; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.quark.base.item.QuarkDoubleHighBlockItem; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.IZetaBlockItemProvider; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class QuarkDoorBlock extends DoorBlock implements IQuarkBlock, IZetaBlockItemProvider { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkFenceBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkFenceBlock.java index 442ebe26c5..2460045ffa 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkFenceBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkFenceBlock.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.NonNullList; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.FenceBlock; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class QuarkFenceBlock extends FenceBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkFenceGateBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkFenceGateBlock.java index 8f81e91294..605f4c4d16 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkFenceGateBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkFenceGateBlock.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.NonNullList; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.FenceGateBlock; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkFlammableBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkFlammableBlock.java index b41edfd49b..b1a8808433 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkFlammableBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkFlammableBlock.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.base.block; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.zeta.module.ZetaModule; public class QuarkFlammableBlock extends QuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkFlammablePillarBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkFlammablePillarBlock.java index 215f0ff7a8..26510c55de 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkFlammablePillarBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkFlammablePillarBlock.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.base.block; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.zeta.module.ZetaModule; public class QuarkFlammablePillarBlock extends QuarkPillarBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkGlassBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkGlassBlock.java index 5a57dab2a8..1657a258b4 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkGlassBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkGlassBlock.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.base.block; -import javax.annotation.Nonnull; - -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; @@ -17,6 +12,10 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nonnull; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkInheritedPaneBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkInheritedPaneBlock.java index 79862a00a2..0fe8ac4c4c 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkInheritedPaneBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkInheritedPaneBlock.java @@ -1,15 +1,14 @@ package org.violetmoon.quark.base.block; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.zeta.registry.IZetaBlockColorProvider; -import org.violetmoon.zeta.registry.IZetaItemColorProvider; - import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.zeta.registry.IZetaBlockColorProvider; +import org.violetmoon.zeta.registry.IZetaItemColorProvider; + +import javax.annotation.Nullable; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkLeavesBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkLeavesBlock.java index 3c19e8fcb0..9696d42334 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkLeavesBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkLeavesBlock.java @@ -1,19 +1,17 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LeavesBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class QuarkLeavesBlock extends LeavesBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkPaneBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkPaneBlock.java index 61934880d7..869cf1f6d5 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkPaneBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkPaneBlock.java @@ -5,14 +5,12 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.IronBarsBlock; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.handler.CreativeTabHandler; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.RenderLayerRegistry.Layer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.BooleanSupplier; public class QuarkPaneBlock extends IronBarsBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkPillarBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkPillarBlock.java index 18b899486c..41401ff1f2 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkPillarBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkPillarBlock.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.NonNullList; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.RotatedPillarBlock; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class QuarkPillarBlock extends RotatedPillarBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkPressurePlateBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkPressurePlateBlock.java index 4c304bb52b..e32d29a6c2 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkPressurePlateBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkPressurePlateBlock.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.NonNullList; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.PressurePlateBlock; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkSaplingBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkSaplingBlock.java index c8f70b37e0..d9b3723c6c 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkSaplingBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkSaplingBlock.java @@ -1,13 +1,5 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.NonNullList; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; @@ -15,6 +7,12 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SaplingBlock; import net.minecraft.world.level.block.grower.AbstractTreeGrower; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nonnull; +import java.util.function.BooleanSupplier; public abstract class QuarkSaplingBlock extends SaplingBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkSlabBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkSlabBlock.java index 070d4b6506..f152778304 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkSlabBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkSlabBlock.java @@ -9,10 +9,6 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.SlabBlock; import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.CreativeTabHandler; import org.violetmoon.quark.base.handler.VariantHandler; @@ -20,6 +16,8 @@ import org.violetmoon.zeta.registry.IZetaBlockColorProvider; import org.violetmoon.zeta.registry.IZetaItemColorProvider; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.BooleanSupplier; public class QuarkSlabBlock extends SlabBlock implements IQuarkBlock, IZetaBlockColorProvider { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkStairsBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkStairsBlock.java index 7ec24e6f39..6b6f5fdf16 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkStairsBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkStairsBlock.java @@ -1,17 +1,5 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.quark.base.handler.VariantHandler; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.IZetaBlockColorProvider; -import org.violetmoon.zeta.registry.IZetaItemColorProvider; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; @@ -21,6 +9,16 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.quark.base.handler.VariantHandler; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.IZetaBlockColorProvider; +import org.violetmoon.zeta.registry.IZetaItemColorProvider; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class QuarkStairsBlock extends StairBlock implements IQuarkBlock, IZetaBlockColorProvider { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkStandingSignBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkStandingSignBlock.java index 366d0bafbc..607f07f1de 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkStandingSignBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkStandingSignBlock.java @@ -1,14 +1,12 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nullable; - +import net.minecraft.world.level.block.StandingSignBlock; +import net.minecraft.world.level.block.state.properties.WoodType; import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.level.block.StandingSignBlock; -import net.minecraft.world.level.block.state.properties.WoodType; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class QuarkStandingSignBlock extends StandingSignBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkTrapdoorBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkTrapdoorBlock.java index ad203546be..44ffd2baf9 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkTrapdoorBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkTrapdoorBlock.java @@ -1,23 +1,20 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.LadderBlock; import net.minecraft.world.level.block.TrapDoorBlock; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class QuarkTrapdoorBlock extends TrapDoorBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkVineBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkVineBlock.java index 55a49c6a13..813691802a 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkVineBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkVineBlock.java @@ -1,14 +1,5 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; @@ -22,6 +13,13 @@ import net.minecraft.world.level.block.VineBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class QuarkVineBlock extends VineBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkWallBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkWallBlock.java index ef8f78adc9..5a8d25a8c1 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkWallBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkWallBlock.java @@ -7,10 +7,6 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.WallBlock; import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.CreativeTabHandler; import org.violetmoon.quark.base.handler.VariantHandler; @@ -18,6 +14,8 @@ import org.violetmoon.zeta.registry.IZetaBlockColorProvider; import org.violetmoon.zeta.registry.IZetaItemColorProvider; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.BooleanSupplier; public class QuarkWallBlock extends WallBlock implements IQuarkBlock, IZetaBlockColorProvider { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkWallSignBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkWallSignBlock.java index f41de8534d..6425e117d1 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkWallSignBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkWallSignBlock.java @@ -1,14 +1,12 @@ package org.violetmoon.quark.base.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nullable; - +import net.minecraft.world.level.block.WallSignBlock; +import net.minecraft.world.level.block.state.properties.WoodType; import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.level.block.WallSignBlock; -import net.minecraft.world.level.block.state.properties.WoodType; +import javax.annotation.Nullable; +import java.util.function.BooleanSupplier; public class QuarkWallSignBlock extends WallSignBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/base/block/QuarkWoodenButtonBlock.java b/src/main/java/org/violetmoon/quark/base/block/QuarkWoodenButtonBlock.java index c46cef9537..a544fcb862 100644 --- a/src/main/java/org/violetmoon/quark/base/block/QuarkWoodenButtonBlock.java +++ b/src/main/java/org/violetmoon/quark/base/block/QuarkWoodenButtonBlock.java @@ -3,11 +3,10 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.item.CreativeModeTab; +import org.violetmoon.zeta.module.ZetaModule; import javax.annotation.Nonnull; -import org.violetmoon.zeta.module.ZetaModule; - public class QuarkWoodenButtonBlock extends QuarkButtonBlock { public QuarkWoodenButtonBlock(String regname, ZetaModule module, Properties properties) { diff --git a/src/main/java/org/violetmoon/quark/base/capability/CapabilityHandler.java b/src/main/java/org/violetmoon/quark/base/capability/CapabilityHandler.java index 1ba9b424e1..9dfaac3ba6 100644 --- a/src/main/java/org/violetmoon/quark/base/capability/CapabilityHandler.java +++ b/src/main/java/org/violetmoon/quark/base/capability/CapabilityHandler.java @@ -1,5 +1,7 @@ package org.violetmoon.quark.base.capability; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; import org.violetmoon.quark.addons.oddities.capability.MagnetTracker; import org.violetmoon.quark.api.ICustomSorting; import org.violetmoon.quark.api.IRuneColorProvider; @@ -9,9 +11,6 @@ import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.play.loading.ZAttachCapabilities; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; - //TODO: push these event handlers into their respective modules public class CapabilityHandler { private static final ResourceLocation DROPOFF_MANAGER = new ResourceLocation(Quark.MOD_ID, "dropoff"); diff --git a/src/main/java/org/violetmoon/quark/base/capability/dummy/DummyMagnetTracker.java b/src/main/java/org/violetmoon/quark/base/capability/dummy/DummyMagnetTracker.java index cf1f73a522..5e94448e78 100644 --- a/src/main/java/org/violetmoon/quark/base/capability/dummy/DummyMagnetTracker.java +++ b/src/main/java/org/violetmoon/quark/base/capability/dummy/DummyMagnetTracker.java @@ -3,12 +3,11 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; +import org.violetmoon.quark.api.IMagnetTracker; import java.util.Collection; import java.util.Collections; -import org.violetmoon.quark.api.IMagnetTracker; - /** * @author WireSegal * Created at 4:50 PM on 3/1/20. diff --git a/src/main/java/org/violetmoon/quark/base/capability/dummy/DummyRuneColor.java b/src/main/java/org/violetmoon/quark/base/capability/dummy/DummyRuneColor.java index e073e0aefc..465dcf9ba7 100644 --- a/src/main/java/org/violetmoon/quark/base/capability/dummy/DummyRuneColor.java +++ b/src/main/java/org/violetmoon/quark/base/capability/dummy/DummyRuneColor.java @@ -1,8 +1,7 @@ package org.violetmoon.quark.base.capability.dummy; -import org.violetmoon.quark.api.IRuneColorProvider; - import net.minecraft.world.item.ItemStack; +import org.violetmoon.quark.api.IRuneColorProvider; public class DummyRuneColor implements IRuneColorProvider { diff --git a/src/main/java/org/violetmoon/quark/base/capability/dummy/DummySorting.java b/src/main/java/org/violetmoon/quark/base/capability/dummy/DummySorting.java index bc7768879b..1709c9b9ea 100644 --- a/src/main/java/org/violetmoon/quark/base/capability/dummy/DummySorting.java +++ b/src/main/java/org/violetmoon/quark/base/capability/dummy/DummySorting.java @@ -10,11 +10,10 @@ */ package org.violetmoon.quark.base.capability.dummy; -import java.util.Comparator; - +import net.minecraft.world.item.ItemStack; import org.violetmoon.quark.api.ICustomSorting; -import net.minecraft.world.item.ItemStack; +import java.util.Comparator; public class DummySorting implements ICustomSorting { @Override diff --git a/src/main/java/org/violetmoon/quark/base/client/config/QButton.java b/src/main/java/org/violetmoon/quark/base/client/config/QButton.java index 02698f41bd..d604b28de7 100644 --- a/src/main/java/org/violetmoon/quark/base/client/config/QButton.java +++ b/src/main/java/org/violetmoon/quark/base/client/config/QButton.java @@ -1,20 +1,5 @@ package org.violetmoon.quark.base.client.config; -import java.awt.*; -import java.io.File; -import java.io.IOException; -import java.time.Month; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.QuarkClient; -import org.violetmoon.quark.base.handler.ContributorRewardHandler; -import org.violetmoon.quark.base.handler.GeneralConfig; -import org.violetmoon.quark.base.handler.MiscUtil; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; @@ -23,6 +8,19 @@ import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import org.violetmoon.quark.base.QuarkClient; +import org.violetmoon.quark.base.handler.ContributorRewardHandler; +import org.violetmoon.quark.base.handler.GeneralConfig; +import org.violetmoon.quark.base.handler.MiscUtil; + +import javax.annotation.Nonnull; +import java.awt.*; +import java.io.File; +import java.io.IOException; +import java.time.Month; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; public class QButton extends Button { diff --git a/src/main/java/org/violetmoon/quark/base/client/config/QButtonHandler.java b/src/main/java/org/violetmoon/quark/base/client/config/QButtonHandler.java index ed732a766a..807d415f66 100644 --- a/src/main/java/org/violetmoon/quark/base/client/config/QButtonHandler.java +++ b/src/main/java/org/violetmoon/quark/base/client/config/QButtonHandler.java @@ -8,13 +8,12 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.resources.language.I18n; - -import java.util.List; - import org.violetmoon.quark.base.handler.GeneralConfig; import org.violetmoon.zeta.client.event.play.ZScreen; import org.violetmoon.zeta.event.bus.PlayEvent; +import java.util.List; + public class QButtonHandler { @PlayEvent diff --git a/src/main/java/org/violetmoon/quark/base/client/config/QuarkConfigHomeScreen.java b/src/main/java/org/violetmoon/quark/base/client/config/QuarkConfigHomeScreen.java index 577260d2cd..8a86ddf47b 100644 --- a/src/main/java/org/violetmoon/quark/base/client/config/QuarkConfigHomeScreen.java +++ b/src/main/java/org/violetmoon/quark/base/client/config/QuarkConfigHomeScreen.java @@ -1,16 +1,5 @@ package org.violetmoon.quark.base.client.config; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.QuarkClient; -import org.violetmoon.quark.base.handler.ContributorRewardHandler; -import org.violetmoon.quark.base.handler.GeneralConfig; -import org.violetmoon.zeta.client.config.screen.ZetaConfigHomeScreen; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -20,6 +9,15 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.QuarkClient; +import org.violetmoon.quark.base.handler.ContributorRewardHandler; +import org.violetmoon.quark.base.handler.GeneralConfig; +import org.violetmoon.zeta.client.config.screen.ZetaConfigHomeScreen; + +import javax.annotation.Nonnull; +import java.util.Iterator; +import java.util.List; public class QuarkConfigHomeScreen extends ZetaConfigHomeScreen { diff --git a/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java b/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java index 99801a6a76..23fa7b1af2 100644 --- a/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java +++ b/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java @@ -1,13 +1,5 @@ package org.violetmoon.quark.base.client.config; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.QuarkClient; -import org.violetmoon.zeta.client.TopLayerTooltipHandler; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.Util; @@ -15,6 +7,11 @@ import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.QuarkClient; + +import javax.annotation.Nonnull; +import java.util.List; public class SocialButton extends Button { diff --git a/src/main/java/org/violetmoon/quark/base/client/handler/InventoryButtonHandler.java b/src/main/java/org/violetmoon/quark/base/client/handler/InventoryButtonHandler.java index cec1493c49..1ea19a7bf8 100644 --- a/src/main/java/org/violetmoon/quark/base/client/handler/InventoryButtonHandler.java +++ b/src/main/java/org/violetmoon/quark/base/client/handler/InventoryButtonHandler.java @@ -15,9 +15,6 @@ import net.minecraft.world.inventory.Slot; import net.minecraftforge.client.settings.KeyConflictContext; import net.minecraftforge.client.settings.KeyModifier; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.addons.oddities.client.screen.BackpackInventoryScreen; import org.violetmoon.quark.api.IQuarkButtonAllowed; import org.violetmoon.quark.base.Quark; @@ -29,6 +26,7 @@ import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.*; import java.util.function.Consumer; import java.util.function.Predicate; diff --git a/src/main/java/org/violetmoon/quark/base/client/handler/ModelHandler.java b/src/main/java/org/violetmoon/quark/base/client/handler/ModelHandler.java index 66d0e2cca8..84807911f3 100644 --- a/src/main/java/org/violetmoon/quark/base/client/handler/ModelHandler.java +++ b/src/main/java/org/violetmoon/quark/base/client/handler/ModelHandler.java @@ -1,25 +1,5 @@ package org.violetmoon.quark.base.client.handler; -import java.util.HashMap; -import java.util.Map; -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.function.Supplier; - -import org.apache.commons.lang3.tuple.Pair; -import org.violetmoon.quark.addons.oddities.client.model.BackpackModel; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.client.render.QuarkArmorModel; -import org.violetmoon.quark.content.mobs.client.model.CrabModel; -import org.violetmoon.quark.content.mobs.client.model.ForgottenHatModel; -import org.violetmoon.quark.content.mobs.client.model.FoxhoundModel; -import org.violetmoon.quark.content.mobs.client.model.ShibaModel; -import org.violetmoon.quark.content.mobs.client.model.StonelingModel; -import org.violetmoon.quark.content.mobs.client.model.ToretoiseModel; -import org.violetmoon.quark.content.mobs.client.model.WraithModel; -import org.violetmoon.zeta.client.event.load.ZRegisterLayerDefinitions; -import org.violetmoon.zeta.event.bus.LoadEvent; - import net.minecraft.client.Minecraft; import net.minecraft.client.model.BoatModel; import net.minecraft.client.model.EntityModel; @@ -29,6 +9,19 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.Mob; +import org.apache.commons.lang3.tuple.Pair; +import org.violetmoon.quark.addons.oddities.client.model.BackpackModel; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.client.render.QuarkArmorModel; +import org.violetmoon.quark.content.mobs.client.model.*; +import org.violetmoon.zeta.client.event.load.ZRegisterLayerDefinitions; +import org.violetmoon.zeta.event.bus.LoadEvent; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.function.Supplier; //TODO ZETA: Move into respective modules so it's not a singleton public class ModelHandler { diff --git a/src/main/java/org/violetmoon/quark/base/client/handler/NetworkProfilingHandler.java b/src/main/java/org/violetmoon/quark/base/client/handler/NetworkProfilingHandler.java index 45ac01f42f..ac062ce05f 100644 --- a/src/main/java/org/violetmoon/quark/base/client/handler/NetworkProfilingHandler.java +++ b/src/main/java/org/violetmoon/quark/base/client/handler/NetworkProfilingHandler.java @@ -1,15 +1,14 @@ package org.violetmoon.quark.base.client.handler; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import net.minecraft.ChatFormatting; import org.violetmoon.quark.base.handler.GeneralConfig; import org.violetmoon.zeta.client.event.play.ZCustomizeDebugText; import org.violetmoon.zeta.event.bus.PlayEvent; -import net.minecraft.ChatFormatting; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class NetworkProfilingHandler { diff --git a/src/main/java/org/violetmoon/quark/base/client/handler/RequiredModTooltipHandler.java b/src/main/java/org/violetmoon/quark/base/client/handler/RequiredModTooltipHandler.java index cc2640b5af..1c95a613c0 100644 --- a/src/main/java/org/violetmoon/quark/base/client/handler/RequiredModTooltipHandler.java +++ b/src/main/java/org/violetmoon/quark/base/client/handler/RequiredModTooltipHandler.java @@ -1,21 +1,20 @@ package org.violetmoon.quark.base.client.handler; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.violetmoon.quark.base.handler.GeneralConfig; -import org.violetmoon.zeta.Zeta; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.play.ZItemTooltip; - import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraftforge.fml.ModList; +import org.violetmoon.quark.base.handler.GeneralConfig; +import org.violetmoon.zeta.Zeta; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.play.ZItemTooltip; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class RequiredModTooltipHandler { diff --git a/src/main/java/org/violetmoon/quark/base/client/render/QuarkArmorModel.java b/src/main/java/org/violetmoon/quark/base/client/render/QuarkArmorModel.java index 82abc81a75..c9d5458c53 100644 --- a/src/main/java/org/violetmoon/quark/base/client/render/QuarkArmorModel.java +++ b/src/main/java/org/violetmoon/quark/base/client/render/QuarkArmorModel.java @@ -1,10 +1,7 @@ package org.violetmoon.quark.base.client.render; -import java.util.function.Consumer; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; - import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -19,6 +16,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; +import java.util.function.Consumer; @OnlyIn(Dist.CLIENT) public class QuarkArmorModel extends HumanoidModel { diff --git a/src/main/java/org/violetmoon/quark/base/client/render/QuarkBoatRenderer.java b/src/main/java/org/violetmoon/quark/base/client/render/QuarkBoatRenderer.java index ec514dc9a7..3c33514fc4 100644 --- a/src/main/java/org/violetmoon/quark/base/client/render/QuarkBoatRenderer.java +++ b/src/main/java/org/violetmoon/quark/base/client/render/QuarkBoatRenderer.java @@ -1,21 +1,11 @@ package org.violetmoon.quark.base.client.render; -import java.util.Map; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.client.handler.ModelHandler; -import org.violetmoon.quark.base.handler.WoodSetHandler; -import org.violetmoon.quark.base.item.boat.IQuarkBoat; - import com.google.common.base.Functions; import com.google.common.collect.ImmutableMap; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Quaternion; import com.mojang.math.Vector3f; - import net.minecraft.client.model.BoatModel; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -25,6 +15,13 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.entity.vehicle.Boat; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.client.handler.ModelHandler; +import org.violetmoon.quark.base.handler.WoodSetHandler; +import org.violetmoon.quark.base.item.boat.IQuarkBoat; + +import javax.annotation.Nonnull; +import java.util.Map; public class QuarkBoatRenderer extends EntityRenderer { diff --git a/src/main/java/org/violetmoon/quark/base/config/ConfigFlagManager.java b/src/main/java/org/violetmoon/quark/base/config/ConfigFlagManager.java index 81e0d2108b..0bc25c723f 100644 --- a/src/main/java/org/violetmoon/quark/base/config/ConfigFlagManager.java +++ b/src/main/java/org/violetmoon/quark/base/config/ConfigFlagManager.java @@ -2,9 +2,6 @@ import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; - -import java.util.*; - import org.violetmoon.quark.base.handler.GeneralConfig; import org.violetmoon.zeta.Zeta; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -13,6 +10,11 @@ import org.violetmoon.zeta.recipe.FlagIngredient; import org.violetmoon.zeta.registry.CraftingExtensionsRegistry; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + public final class ConfigFlagManager { public final Zeta zeta; diff --git a/src/main/java/org/violetmoon/quark/base/config/FlagCondition.java b/src/main/java/org/violetmoon/quark/base/config/FlagCondition.java index 3c3f52d389..0733cf24dd 100644 --- a/src/main/java/org/violetmoon/quark/base/config/FlagCondition.java +++ b/src/main/java/org/violetmoon/quark/base/config/FlagCondition.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.base.config; -import java.util.function.BooleanSupplier; - +import com.google.gson.JsonObject; +import net.minecraft.resources.ResourceLocation; import org.violetmoon.zeta.recipe.IZetaCondition; import org.violetmoon.zeta.recipe.IZetaConditionSerializer; -import com.google.gson.JsonObject; -import net.minecraft.resources.ResourceLocation; +import java.util.function.BooleanSupplier; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/base/config/SyncedFlagHandler.java b/src/main/java/org/violetmoon/quark/base/config/SyncedFlagHandler.java index a9e947e87d..6ec597af35 100644 --- a/src/main/java/org/violetmoon/quark/base/config/SyncedFlagHandler.java +++ b/src/main/java/org/violetmoon/quark/base/config/SyncedFlagHandler.java @@ -5,16 +5,14 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - -import java.util.*; -import java.util.stream.Collectors; - import org.violetmoon.quark.base.network.QuarkNetwork; import org.violetmoon.quark.base.network.message.structural.S2CUpdateFlag; import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.load.ZConfigChanged; +import java.util.*; +import java.util.stream.Collectors; + public class SyncedFlagHandler { private static ConfigFlagManager flagManager; private static List sortedFlags; diff --git a/src/main/java/org/violetmoon/quark/base/config/type/BiomeTagConfig.java b/src/main/java/org/violetmoon/quark/base/config/type/BiomeTagConfig.java index b6d95011b6..288ade6a83 100644 --- a/src/main/java/org/violetmoon/quark/base/config/type/BiomeTagConfig.java +++ b/src/main/java/org/violetmoon/quark/base/config/type/BiomeTagConfig.java @@ -5,15 +5,14 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.level.biome.Biome; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.config.ConfigFlagManager; +import org.violetmoon.zeta.module.ZetaModule; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.config.ConfigFlagManager; -import org.violetmoon.zeta.module.ZetaModule; - public class BiomeTagConfig implements IBiomeConfig, IConfigType { private final Object mutex = new Object(); diff --git a/src/main/java/org/violetmoon/quark/base/config/type/ClusterSizeConfig.java b/src/main/java/org/violetmoon/quark/base/config/type/ClusterSizeConfig.java index 0b325f4a29..df5b54596c 100644 --- a/src/main/java/org/violetmoon/quark/base/config/type/ClusterSizeConfig.java +++ b/src/main/java/org/violetmoon/quark/base/config/type/ClusterSizeConfig.java @@ -1,9 +1,8 @@ package org.violetmoon.quark.base.config.type; -import org.violetmoon.quark.base.config.Config; - import net.minecraft.tags.TagKey; import net.minecraft.world.level.biome.Biome; +import org.violetmoon.quark.base.config.Config; public class ClusterSizeConfig implements IConfigType { diff --git a/src/main/java/org/violetmoon/quark/base/config/type/CompoundBiomeConfig.java b/src/main/java/org/violetmoon/quark/base/config/type/CompoundBiomeConfig.java index a8dfe4fd28..281e910fff 100644 --- a/src/main/java/org/violetmoon/quark/base/config/type/CompoundBiomeConfig.java +++ b/src/main/java/org/violetmoon/quark/base/config/type/CompoundBiomeConfig.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.base.config.type; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.config.ConfigFlagManager; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.Holder; import net.minecraft.tags.TagKey; import net.minecraft.world.level.biome.Biome; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.config.ConfigFlagManager; +import org.violetmoon.zeta.module.ZetaModule; public class CompoundBiomeConfig implements IBiomeConfig, IConfigType { diff --git a/src/main/java/org/violetmoon/quark/base/config/type/DimensionConfig.java b/src/main/java/org/violetmoon/quark/base/config/type/DimensionConfig.java index ad878659b2..04b5663e3d 100644 --- a/src/main/java/org/violetmoon/quark/base/config/type/DimensionConfig.java +++ b/src/main/java/org/violetmoon/quark/base/config/type/DimensionConfig.java @@ -3,13 +3,12 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; +import org.violetmoon.quark.base.config.Config; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.violetmoon.quark.base.config.Config; - public class DimensionConfig implements IConfigType { @Config diff --git a/src/main/java/org/violetmoon/quark/base/config/type/OrePocketConfig.java b/src/main/java/org/violetmoon/quark/base/config/type/OrePocketConfig.java index 40988a0e25..ed7702035b 100644 --- a/src/main/java/org/violetmoon/quark/base/config/type/OrePocketConfig.java +++ b/src/main/java/org/violetmoon/quark/base/config/type/OrePocketConfig.java @@ -1,11 +1,10 @@ package org.violetmoon.quark.base.config.type; -import java.util.function.Consumer; - -import org.violetmoon.quark.base.config.Config; - import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; +import org.violetmoon.quark.base.config.Config; + +import java.util.function.Consumer; public class OrePocketConfig implements IConfigType { diff --git a/src/main/java/org/violetmoon/quark/base/config/type/StrictBiomeConfig.java b/src/main/java/org/violetmoon/quark/base/config/type/StrictBiomeConfig.java index c2b8fc46e0..018e23a98e 100644 --- a/src/main/java/org/violetmoon/quark/base/config/type/StrictBiomeConfig.java +++ b/src/main/java/org/violetmoon/quark/base/config/type/StrictBiomeConfig.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.base.config.type; +import net.minecraft.core.Holder; +import net.minecraft.world.level.biome.Biome; +import org.violetmoon.quark.base.config.Config; + import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import org.violetmoon.quark.base.config.Config; - -import net.minecraft.core.Holder; -import net.minecraft.world.level.biome.Biome; - public class StrictBiomeConfig implements IBiomeConfig, IConfigType { @Config(name = "Biomes") diff --git a/src/main/java/org/violetmoon/quark/base/config/type/inputtable/ConvulsionMatrixConfig.java b/src/main/java/org/violetmoon/quark/base/config/type/inputtable/ConvulsionMatrixConfig.java index 3431a0b79f..37064abadc 100644 --- a/src/main/java/org/violetmoon/quark/base/config/type/inputtable/ConvulsionMatrixConfig.java +++ b/src/main/java/org/violetmoon/quark/base/config/type/inputtable/ConvulsionMatrixConfig.java @@ -1,19 +1,17 @@ package org.violetmoon.quark.base.config.type.inputtable; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Nullable; - +import com.google.common.base.Preconditions; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.ConfigFlagManager; import org.violetmoon.quark.base.config.type.IConfigType; import org.violetmoon.quark.content.client.module.GreenerGrassModule; import org.violetmoon.zeta.module.ZetaModule; -import com.google.common.base.Preconditions; +import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; public class ConvulsionMatrixConfig implements IConfigType { diff --git a/src/main/java/org/violetmoon/quark/base/config/type/inputtable/RGBAColorConfig.java b/src/main/java/org/violetmoon/quark/base/config/type/inputtable/RGBAColorConfig.java index 74844016ae..4da0f69383 100644 --- a/src/main/java/org/violetmoon/quark/base/config/type/inputtable/RGBAColorConfig.java +++ b/src/main/java/org/violetmoon/quark/base/config/type/inputtable/RGBAColorConfig.java @@ -1,9 +1,9 @@ package org.violetmoon.quark.base.config.type.inputtable; -import java.util.Objects; - import org.violetmoon.quark.base.config.Config; +import java.util.Objects; + public class RGBAColorConfig extends RGBColorConfig { @Config public double a; diff --git a/src/main/java/org/violetmoon/quark/base/config/type/inputtable/RGBColorConfig.java b/src/main/java/org/violetmoon/quark/base/config/type/inputtable/RGBColorConfig.java index 65f5d87793..10d369ca96 100644 --- a/src/main/java/org/violetmoon/quark/base/config/type/inputtable/RGBColorConfig.java +++ b/src/main/java/org/violetmoon/quark/base/config/type/inputtable/RGBColorConfig.java @@ -1,13 +1,12 @@ package org.violetmoon.quark.base.config.type.inputtable; -import java.util.Objects; - +import net.minecraft.util.Mth; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.ConfigFlagManager; import org.violetmoon.quark.base.config.type.IConfigType; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.util.Mth; +import java.util.Objects; public class RGBColorConfig implements IConfigType { diff --git a/src/main/java/org/violetmoon/quark/base/handler/ContributorRewardHandler.java b/src/main/java/org/violetmoon/quark/base/handler/ContributorRewardHandler.java index bdd077fb0b..a0b3994039 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/ContributorRewardHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/ContributorRewardHandler.java @@ -7,13 +7,6 @@ import net.minecraft.client.player.AbstractClientPlayer; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; - -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import java.util.*; - import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.client.event.play.ZRenderPlayer; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -21,6 +14,12 @@ import org.violetmoon.zeta.event.load.ZCommonSetup; import org.violetmoon.zeta.event.play.entity.player.ZPlayer; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; +import java.net.URLConnection; +import java.util.*; + public class ContributorRewardHandler { private static final ImmutableSet DEV_UUID = ImmutableSet.of( diff --git a/src/main/java/org/violetmoon/quark/base/handler/EntityAttributeHandler.java b/src/main/java/org/violetmoon/quark/base/handler/EntityAttributeHandler.java index 9ec5ed8c62..38c1f07d59 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/EntityAttributeHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/EntityAttributeHandler.java @@ -1,15 +1,14 @@ package org.violetmoon.quark.base.handler; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Supplier; - -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZEntityAttributeCreation; - import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.AttributeSupplier.Builder; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZEntityAttributeCreation; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Supplier; public final class EntityAttributeHandler { diff --git a/src/main/java/org/violetmoon/quark/base/handler/FuelHandler.java b/src/main/java/org/violetmoon/quark/base/handler/FuelHandler.java index a578a347d2..b05b08f794 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/FuelHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/FuelHandler.java @@ -1,9 +1,11 @@ package org.violetmoon.quark.base.handler; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.material.Material; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.building.block.VerticalSlabBlock; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -11,12 +13,9 @@ import org.violetmoon.zeta.event.load.ZLoadComplete; import org.violetmoon.zeta.event.play.ZFurnaceFuelBurnTime; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.SlabBlock; -import net.minecraft.world.level.material.Material; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; public class FuelHandler { diff --git a/src/main/java/org/violetmoon/quark/base/handler/GeneralConfig.java b/src/main/java/org/violetmoon/quark/base/handler/GeneralConfig.java index b02b1eb622..39def250de 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/GeneralConfig.java +++ b/src/main/java/org/violetmoon/quark/base/handler/GeneralConfig.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.base.handler; -import java.util.List; - +import com.google.common.collect.Lists; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZConfigChanged; import org.violetmoon.zeta.piston.ZetaPistonStructureResolver; -import com.google.common.collect.Lists; +import java.util.List; public class GeneralConfig { diff --git a/src/main/java/org/violetmoon/quark/base/handler/MiscUtil.java b/src/main/java/org/violetmoon/quark/base/handler/MiscUtil.java index 940c9091e6..ec0565d21b 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/MiscUtil.java +++ b/src/main/java/org/violetmoon/quark/base/handler/MiscUtil.java @@ -51,15 +51,13 @@ import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.wrapper.InvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.experimental.module.EnchantmentsBegoneModule; import org.violetmoon.zeta.client.config.screen.ZetaScreen; import org.violetmoon.zeta.client.event.play.ZScreen; import org.violetmoon.zeta.event.bus.PlayEvent; +import javax.annotation.Nonnull; import java.util.LinkedHashSet; import java.util.List; import java.util.Random; diff --git a/src/main/java/org/violetmoon/quark/base/handler/ProxiedItemStackHandler.java b/src/main/java/org/violetmoon/quark/base/handler/ProxiedItemStackHandler.java index 5ba603e089..b345a7ae1a 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/ProxiedItemStackHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/ProxiedItemStackHandler.java @@ -11,12 +11,11 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; +import org.violetmoon.zeta.util.ItemNBTHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.violetmoon.zeta.util.ItemNBTHelper; - /** * @author WireSegal * Created at 4:27 PM on 12/15/18. diff --git a/src/main/java/org/violetmoon/quark/base/handler/QuarkSounds.java b/src/main/java/org/violetmoon/quark/base/handler/QuarkSounds.java index 8862221458..24ba7bf1ea 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/QuarkSounds.java +++ b/src/main/java/org/violetmoon/quark/base/handler/QuarkSounds.java @@ -1,17 +1,15 @@ package org.violetmoon.quark.base.handler; import com.google.common.collect.Lists; - import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; - -import java.util.List; - import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZRegister; +import java.util.List; + /** * @author WireSegal * Created at 12:40 PM on 9/9/19. diff --git a/src/main/java/org/violetmoon/quark/base/handler/RayTraceHandler.java b/src/main/java/org/violetmoon/quark/base/handler/RayTraceHandler.java index a143d364a9..20e86b2a9c 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/RayTraceHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/RayTraceHandler.java @@ -1,7 +1,5 @@ package org.violetmoon.quark.base.handler; -import org.apache.commons.lang3.tuple.Pair; - import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -13,6 +11,7 @@ import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.ForgeMod; +import org.apache.commons.lang3.tuple.Pair; public class RayTraceHandler { diff --git a/src/main/java/org/violetmoon/quark/base/handler/RecipeCrawlHandler.java b/src/main/java/org/violetmoon/quark/base/handler/RecipeCrawlHandler.java index 3b99b4c4ac..244f06cfaa 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/RecipeCrawlHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/RecipeCrawlHandler.java @@ -7,13 +7,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.*; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.AddReloadListenerEvent; -import net.minecraftforge.event.TagsUpdatedEvent; import net.minecraftforge.event.TickEvent.ServerTickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; - -import javax.annotation.Nullable; - import org.violetmoon.quark.api.event.RecipeCrawlEvent; import org.violetmoon.quark.api.event.RecipeCrawlEvent.Visit; import org.violetmoon.quark.base.Quark; @@ -22,6 +17,7 @@ import org.violetmoon.zeta.event.load.ZTagsUpdated; import org.violetmoon.zeta.util.RegistryUtil; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/main/java/org/violetmoon/quark/base/handler/SimilarBlockTypeHandler.java b/src/main/java/org/violetmoon/quark/base/handler/SimilarBlockTypeHandler.java index b00f204c90..c70097bf6e 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/SimilarBlockTypeHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/SimilarBlockTypeHandler.java @@ -1,16 +1,15 @@ package org.violetmoon.quark.base.handler; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - import com.google.common.collect.ImmutableSet; - import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Blocks; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + /** * @author WireSegal * Created at 11:01 AM on 9/1/19. diff --git a/src/main/java/org/violetmoon/quark/base/handler/SortingHandler.java b/src/main/java/org/violetmoon/quark/base/handler/SortingHandler.java index c3b2dd600f..87a6aae584 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/SortingHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/SortingHandler.java @@ -20,10 +20,6 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.SlotItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; - -import java.util.*; -import java.util.function.Predicate; - import org.violetmoon.quark.addons.oddities.inventory.BackpackMenu; import org.violetmoon.quark.addons.oddities.inventory.slot.CachedItemHandlerSlot; import org.violetmoon.quark.api.ICustomSorting; @@ -32,6 +28,9 @@ import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.management.module.InventorySortingModule; +import java.util.*; +import java.util.function.Predicate; + public final class SortingHandler { private static final Comparator FALLBACK_COMPARATOR = jointComparator(Arrays.asList( diff --git a/src/main/java/org/violetmoon/quark/base/handler/ToolInteractionHandler.java b/src/main/java/org/violetmoon/quark/base/handler/ToolInteractionHandler.java index 0975920a5f..6e7f8cddd0 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/ToolInteractionHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/ToolInteractionHandler.java @@ -1,24 +1,8 @@ package org.violetmoon.quark.base.handler; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.lang3.tuple.Pair; -import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; -import org.violetmoon.quark.base.handler.advancement.mod.WaxModifier; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZCommonSetup; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; -import org.violetmoon.zeta.module.ZetaModule; - import com.google.common.collect.HashBiMap; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; - import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; @@ -34,6 +18,16 @@ import net.minecraftforge.common.ToolActions; import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import org.apache.commons.lang3.tuple.Pair; +import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; +import org.violetmoon.quark.base.handler.advancement.mod.WaxModifier; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZCommonSetup; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.*; public final class ToolInteractionHandler { diff --git a/src/main/java/org/violetmoon/quark/base/handler/UndergroundBiomeHandler.java b/src/main/java/org/violetmoon/quark/base/handler/UndergroundBiomeHandler.java index 54358ea137..1af006e214 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/UndergroundBiomeHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/UndergroundBiomeHandler.java @@ -1,23 +1,21 @@ package org.violetmoon.quark.base.handler; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; -import java.util.function.Supplier; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZLoadComplete; -import org.violetmoon.zeta.module.ZetaModule; - import com.mojang.datafixers.util.Pair; - import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Climate; import net.minecraft.world.level.biome.OverworldBiomeBuilder; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZLoadComplete; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Supplier; public final class UndergroundBiomeHandler { diff --git a/src/main/java/org/violetmoon/quark/base/handler/VariantHandler.java b/src/main/java/org/violetmoon/quark/base/handler/VariantHandler.java index d84abf6250..eeb05d4d0e 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/VariantHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/VariantHandler.java @@ -7,11 +7,6 @@ import net.minecraft.world.level.block.FlowerPotBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.Material; - -import java.util.LinkedList; -import java.util.List; -import java.util.function.Function; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.block.QuarkSlabBlock; @@ -19,6 +14,10 @@ import org.violetmoon.quark.base.block.QuarkWallBlock; import org.violetmoon.zeta.registry.RenderLayerRegistry; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Function; + public class VariantHandler { public static final List SLABS = new LinkedList<>(); diff --git a/src/main/java/org/violetmoon/quark/base/handler/WoodSetHandler.java b/src/main/java/org/violetmoon/quark/base/handler/WoodSetHandler.java index 4139ce8e75..06de7761a7 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/WoodSetHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/WoodSetHandler.java @@ -1,49 +1,6 @@ package org.violetmoon.quark.base.handler; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Stream; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.block.IQuarkBlock; -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.quark.base.block.QuarkDoorBlock; -import org.violetmoon.quark.base.block.QuarkFenceBlock; -import org.violetmoon.quark.base.block.QuarkFenceGateBlock; -import org.violetmoon.quark.base.block.QuarkPillarBlock; -import org.violetmoon.quark.base.block.QuarkPressurePlateBlock; -import org.violetmoon.quark.base.block.QuarkStandingSignBlock; -import org.violetmoon.quark.base.block.QuarkTrapdoorBlock; -import org.violetmoon.quark.base.block.QuarkWallSignBlock; -import org.violetmoon.quark.base.block.QuarkWoodenButtonBlock; -import org.violetmoon.quark.base.client.render.QuarkBoatRenderer; -import org.violetmoon.quark.base.item.QuarkSignItem; -import org.violetmoon.quark.base.item.boat.QuarkBoat; -import org.violetmoon.quark.base.item.boat.QuarkBoatDispenseItemBehavior; -import org.violetmoon.quark.base.item.boat.QuarkBoatItem; -import org.violetmoon.quark.base.item.boat.QuarkChestBoat; -import org.violetmoon.quark.content.building.block.HollowLogBlock; -import org.violetmoon.quark.content.building.block.VariantBookshelfBlock; -import org.violetmoon.quark.content.building.block.VariantLadderBlock; -import org.violetmoon.quark.content.building.block.WoodPostBlock; -import org.violetmoon.quark.content.building.module.HollowLogsModule; -import org.violetmoon.quark.content.building.module.VariantBookshelvesModule; -import org.violetmoon.quark.content.building.module.VariantChestsModule; -import org.violetmoon.quark.content.building.module.VariantLaddersModule; -import org.violetmoon.quark.content.building.module.VerticalPlanksModule; -import org.violetmoon.quark.content.building.module.WoodenPostsModule; -import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZCommonSetup; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.module.ZetaModule; - import com.google.common.collect.ImmutableSet; - import net.minecraft.client.renderer.Sheets; import net.minecraft.client.renderer.entity.EntityRenderers; import net.minecraft.core.Direction; @@ -53,12 +10,8 @@ import net.minecraft.world.entity.MobCategory; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.DispenserBlock; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.PressurePlateBlock.Sensitivity; -import net.minecraft.world.level.block.RotatedPillarBlock; -import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockBehaviour.Properties; @@ -66,6 +19,27 @@ import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; import net.minecraftforge.common.ToolActions; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.block.*; +import org.violetmoon.quark.base.client.render.QuarkBoatRenderer; +import org.violetmoon.quark.base.item.QuarkSignItem; +import org.violetmoon.quark.base.item.boat.QuarkBoat; +import org.violetmoon.quark.base.item.boat.QuarkBoatDispenseItemBehavior; +import org.violetmoon.quark.base.item.boat.QuarkBoatItem; +import org.violetmoon.quark.base.item.boat.QuarkChestBoat; +import org.violetmoon.quark.content.building.block.HollowLogBlock; +import org.violetmoon.quark.content.building.block.VariantBookshelfBlock; +import org.violetmoon.quark.content.building.block.VariantLadderBlock; +import org.violetmoon.quark.content.building.block.WoodPostBlock; +import org.violetmoon.quark.content.building.module.*; +import org.violetmoon.zeta.client.event.load.ZClientSetup; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZCommonSetup; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.*; +import java.util.stream.Stream; public class WoodSetHandler { diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/AdvancementModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/AdvancementModifier.java index 4a9361ee25..f9d7d097bc 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/AdvancementModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/AdvancementModifier.java @@ -1,11 +1,10 @@ package org.violetmoon.quark.base.handler.advancement; -import javax.annotation.Nullable; - +import com.google.common.base.Supplier; import org.violetmoon.quark.api.IAdvancementModifier; import org.violetmoon.zeta.module.ZetaModule; -import com.google.common.base.Supplier; +import javax.annotation.Nullable; public abstract class AdvancementModifier implements IAdvancementModifier { diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/MutableAdvancement.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/MutableAdvancement.java index 965d3fe03a..f698f5cb86 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/MutableAdvancement.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/MutableAdvancement.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.base.handler.advancement; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import org.violetmoon.quark.api.IMutableAdvancement; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import net.minecraft.advancements.Advancement; import net.minecraft.advancements.Criterion; +import org.violetmoon.quark.api.IMutableAdvancement; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; public class MutableAdvancement implements IMutableAdvancement { diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/QuarkAdvancementHandler.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/QuarkAdvancementHandler.java index 913986ba9a..a4f935a808 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/QuarkAdvancementHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/QuarkAdvancementHandler.java @@ -1,22 +1,7 @@ package org.violetmoon.quark.base.handler.advancement; -import java.util.Collection; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.function.BooleanSupplier; - -import org.violetmoon.quark.api.IAdvancementModifier; -import org.violetmoon.quark.api.IAdvancementModifierDelegate; -import org.violetmoon.quark.api.event.GatherAdvancementModifiersEvent; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.GeneralConfig; -import org.violetmoon.quark.base.handler.advancement.mod.*; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZAddReloadListener; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; - import net.minecraft.advancements.Advancement; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.resources.ResourceKey; @@ -30,8 +15,19 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Block; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.AddReloadListenerEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; +import org.violetmoon.quark.api.IAdvancementModifier; +import org.violetmoon.quark.api.IAdvancementModifierDelegate; +import org.violetmoon.quark.api.event.GatherAdvancementModifiersEvent; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.GeneralConfig; +import org.violetmoon.quark.base.handler.advancement.mod.*; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZAddReloadListener; + +import java.util.Collection; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.function.BooleanSupplier; public final class QuarkAdvancementHandler { diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/QuarkGenericTrigger.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/QuarkGenericTrigger.java index 67471eea50..6820aec298 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/QuarkGenericTrigger.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/QuarkGenericTrigger.java @@ -2,7 +2,6 @@ import com.google.common.base.Predicates; import com.google.gson.JsonObject; - import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance; import net.minecraft.advancements.critereon.DeserializationContext; import net.minecraft.advancements.critereon.EntityPredicate.Composite; diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/ASeedyPlaceModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/ASeedyPlaceModifier.java index 357af4498d..4f9bbcea82 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/ASeedyPlaceModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/ASeedyPlaceModifier.java @@ -6,13 +6,12 @@ import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; - -import java.util.Set; - import org.violetmoon.quark.api.IMutableAdvancement; import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; import org.violetmoon.zeta.module.ZetaModule; +import java.util.Set; + public class ASeedyPlaceModifier extends AdvancementModifier { private static final ResourceLocation TARGET = new ResourceLocation("husbandry/plant_seed"); diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/AdventuringTimeModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/AdventuringTimeModifier.java index f553276056..e2c125036a 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/AdventuringTimeModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/AdventuringTimeModifier.java @@ -1,19 +1,17 @@ package org.violetmoon.quark.base.handler.advancement.mod; -import java.util.Set; - -import org.violetmoon.quark.api.IMutableAdvancement; -import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; -import org.violetmoon.zeta.module.ZetaModule; - import com.google.common.collect.ImmutableSet; - import net.minecraft.advancements.Criterion; import net.minecraft.advancements.critereon.LocationPredicate; import net.minecraft.advancements.critereon.PlayerTrigger; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; +import org.violetmoon.quark.api.IMutableAdvancement; +import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.Set; public class AdventuringTimeModifier extends AdvancementModifier { diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/BalancedDietModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/BalancedDietModifier.java index 69a77d2e88..9bf0dd7aac 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/BalancedDietModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/BalancedDietModifier.java @@ -8,13 +8,12 @@ import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.ItemLike; - -import java.util.Set; - import org.violetmoon.quark.api.IMutableAdvancement; import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; import org.violetmoon.zeta.module.ZetaModule; +import java.util.Set; + public class BalancedDietModifier extends AdvancementModifier { private static final ResourceLocation TARGET = new ResourceLocation("husbandry/balanced_diet"); diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/FishyBusinessModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/FishyBusinessModifier.java index 8a90b0c77e..69437397f0 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/FishyBusinessModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/FishyBusinessModifier.java @@ -9,13 +9,12 @@ import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.ItemLike; - -import java.util.Set; - import org.violetmoon.quark.api.IMutableAdvancement; import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; import org.violetmoon.zeta.module.ZetaModule; +import java.util.Set; + public class FishyBusinessModifier extends AdvancementModifier { private static final ResourceLocation TARGET = new ResourceLocation("husbandry/fishy_business"); diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/FuriousCocktailModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/FuriousCocktailModifier.java index 7155045971..fbe536626d 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/FuriousCocktailModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/FuriousCocktailModifier.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.base.handler.advancement.mod; -import java.util.Set; -import java.util.function.BooleanSupplier; - -import org.violetmoon.quark.api.IMutableAdvancement; -import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; -import org.violetmoon.zeta.module.ZetaModule; - import com.google.common.collect.ImmutableSet; - import net.minecraft.advancements.Criterion; import net.minecraft.advancements.critereon.EffectsChangedTrigger; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffect; +import org.violetmoon.quark.api.IMutableAdvancement; +import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.Set; +import java.util.function.BooleanSupplier; public class FuriousCocktailModifier extends AdvancementModifier { diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/GlowAndBeholdModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/GlowAndBeholdModifier.java index d213b2b190..f50b2d2dbe 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/GlowAndBeholdModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/GlowAndBeholdModifier.java @@ -11,13 +11,12 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; - -import java.util.Set; - import org.violetmoon.quark.api.IMutableAdvancement; import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; import org.violetmoon.zeta.module.ZetaModule; +import java.util.Set; + public class GlowAndBeholdModifier extends AdvancementModifier { private static final ResourceLocation TARGET = new ResourceLocation("husbandry/make_a_sign_glow"); diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/MonsterHunterModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/MonsterHunterModifier.java index 31bc5095dd..ff8854c591 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/MonsterHunterModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/MonsterHunterModifier.java @@ -1,13 +1,6 @@ package org.violetmoon.quark.base.handler.advancement.mod; -import java.util.Set; - -import org.violetmoon.quark.api.IMutableAdvancement; -import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; -import org.violetmoon.zeta.module.ZetaModule; - import com.google.common.collect.ImmutableSet; - import net.minecraft.advancements.Criterion; import net.minecraft.advancements.critereon.EntityPredicate; import net.minecraft.advancements.critereon.EntityTypePredicate; @@ -15,6 +8,11 @@ import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; +import org.violetmoon.quark.api.IMutableAdvancement; +import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.Set; public class MonsterHunterModifier extends AdvancementModifier { diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/TacticalFishingModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/TacticalFishingModifier.java index a06704c288..03907e8c8e 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/TacticalFishingModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/TacticalFishingModifier.java @@ -9,13 +9,12 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BucketItem; import net.minecraft.world.level.ItemLike; - -import java.util.Set; - import org.violetmoon.quark.api.IMutableAdvancement; import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; import org.violetmoon.zeta.module.ZetaModule; +import java.util.Set; + public class TacticalFishingModifier extends AdvancementModifier { private static final ResourceLocation TARGET = new ResourceLocation("husbandry/tactical_fishing"); diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/TwoByTwoModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/TwoByTwoModifier.java index cde1f5647b..2844c489f4 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/TwoByTwoModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/TwoByTwoModifier.java @@ -1,14 +1,7 @@ package org.violetmoon.quark.base.handler.advancement.mod; -import java.util.Set; - -import org.violetmoon.quark.api.IMutableAdvancement; -import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; -import org.violetmoon.zeta.module.ZetaModule; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; - import net.minecraft.advancements.Criterion; import net.minecraft.advancements.critereon.BredAnimalsTrigger; import net.minecraft.advancements.critereon.EntityPredicate; @@ -16,6 +9,11 @@ import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; +import org.violetmoon.quark.api.IMutableAdvancement; +import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.Set; public class TwoByTwoModifier extends AdvancementModifier { diff --git a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/WaxModifier.java b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/WaxModifier.java index 4940604371..b3c1d3391f 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/WaxModifier.java +++ b/src/main/java/org/violetmoon/quark/base/handler/advancement/mod/WaxModifier.java @@ -1,19 +1,17 @@ package org.violetmoon.quark.base.handler.advancement.mod; -import java.util.HashSet; -import java.util.Set; - -import org.violetmoon.quark.api.IMutableAdvancement; -import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; -import org.violetmoon.zeta.module.ZetaModule; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; - import net.minecraft.advancements.Criterion; import net.minecraft.advancements.critereon.ItemInteractWithBlockTrigger; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; +import org.violetmoon.quark.api.IMutableAdvancement; +import org.violetmoon.quark.base.handler.advancement.AdvancementModifier; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.HashSet; +import java.util.Set; public class WaxModifier extends AdvancementModifier { diff --git a/src/main/java/org/violetmoon/quark/base/item/QuarkArrowItem.java b/src/main/java/org/violetmoon/quark/base/item/QuarkArrowItem.java index 854318c16f..2e0c84a66a 100644 --- a/src/main/java/org/violetmoon/quark/base/item/QuarkArrowItem.java +++ b/src/main/java/org/violetmoon/quark/base/item/QuarkArrowItem.java @@ -1,13 +1,5 @@ package org.violetmoon.quark.base.item; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.zeta.item.IZetaItem; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.NonNullList; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow; @@ -16,6 +8,12 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.zeta.item.IZetaItem; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import java.util.function.BooleanSupplier; public abstract class QuarkArrowItem extends ArrowItem implements IZetaItem { diff --git a/src/main/java/org/violetmoon/quark/base/item/QuarkDoubleHighBlockItem.java b/src/main/java/org/violetmoon/quark/base/item/QuarkDoubleHighBlockItem.java index 6e082c46f2..640ef94660 100644 --- a/src/main/java/org/violetmoon/quark/base/item/QuarkDoubleHighBlockItem.java +++ b/src/main/java/org/violetmoon/quark/base/item/QuarkDoubleHighBlockItem.java @@ -4,13 +4,11 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.DoubleHighBlockItem; import net.minecraft.world.item.ItemStack; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.zeta.item.IZetaItem; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.function.BooleanSupplier; public class QuarkDoubleHighBlockItem extends DoubleHighBlockItem implements IZetaItem { diff --git a/src/main/java/org/violetmoon/quark/base/item/QuarkItem.java b/src/main/java/org/violetmoon/quark/base/item/QuarkItem.java index f4e6d7e6d9..c37a7c8616 100644 --- a/src/main/java/org/violetmoon/quark/base/item/QuarkItem.java +++ b/src/main/java/org/violetmoon/quark/base/item/QuarkItem.java @@ -4,14 +4,12 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.client.handler.RequiredModTooltipHandler; import org.violetmoon.zeta.item.IZetaItem; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.function.BooleanSupplier; public class QuarkItem extends Item implements IZetaItem { diff --git a/src/main/java/org/violetmoon/quark/base/item/QuarkMobBucketItem.java b/src/main/java/org/violetmoon/quark/base/item/QuarkMobBucketItem.java index a31dd1acc4..8982a1fb36 100644 --- a/src/main/java/org/violetmoon/quark/base/item/QuarkMobBucketItem.java +++ b/src/main/java/org/violetmoon/quark/base/item/QuarkMobBucketItem.java @@ -7,13 +7,11 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.MobBucketItem; import net.minecraft.world.level.material.Fluid; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.item.IZetaItem; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.function.BooleanSupplier; import java.util.function.Supplier; diff --git a/src/main/java/org/violetmoon/quark/base/item/QuarkMusicDiscItem.java b/src/main/java/org/violetmoon/quark/base/item/QuarkMusicDiscItem.java index cba2be906f..6ca6e1eefa 100644 --- a/src/main/java/org/violetmoon/quark/base/item/QuarkMusicDiscItem.java +++ b/src/main/java/org/violetmoon/quark/base/item/QuarkMusicDiscItem.java @@ -13,14 +13,12 @@ import net.minecraft.world.item.*; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.tools.module.AmbientDiscsModule; import org.violetmoon.zeta.item.IZetaItem; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.function.BooleanSupplier; import java.util.function.Supplier; diff --git a/src/main/java/org/violetmoon/quark/base/item/QuarkSignItem.java b/src/main/java/org/violetmoon/quark/base/item/QuarkSignItem.java index f48f22b40c..254279b9b1 100644 --- a/src/main/java/org/violetmoon/quark/base/item/QuarkSignItem.java +++ b/src/main/java/org/violetmoon/quark/base/item/QuarkSignItem.java @@ -1,20 +1,18 @@ package org.violetmoon.quark.base.item; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.block.IQuarkBlock; -import org.violetmoon.zeta.item.IZetaItem; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.NonNullList; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.SignItem; import net.minecraft.world.level.block.Block; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.block.IQuarkBlock; +import org.violetmoon.zeta.item.IZetaItem; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import java.util.function.BooleanSupplier; public class QuarkSignItem extends SignItem implements IZetaItem { diff --git a/src/main/java/org/violetmoon/quark/base/item/QuarkSpawnEggItem.java b/src/main/java/org/violetmoon/quark/base/item/QuarkSpawnEggItem.java index 8f31fbff83..3ede214b3a 100644 --- a/src/main/java/org/violetmoon/quark/base/item/QuarkSpawnEggItem.java +++ b/src/main/java/org/violetmoon/quark/base/item/QuarkSpawnEggItem.java @@ -6,13 +6,11 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.ForgeSpawnEggItem; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.item.IZetaItem; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.function.BooleanSupplier; import java.util.function.Supplier; diff --git a/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoat.java b/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoat.java index 77788b10f7..f36a1773b9 100644 --- a/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoat.java +++ b/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoat.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.base.item.boat; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.handler.WoodSetHandler; -import org.violetmoon.quark.base.handler.WoodSetHandler.QuarkBoatType; - import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; @@ -16,6 +11,10 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.Level; +import org.violetmoon.quark.base.handler.WoodSetHandler; +import org.violetmoon.quark.base.handler.WoodSetHandler.QuarkBoatType; + +import javax.annotation.Nonnull; public class QuarkBoat extends Boat implements IQuarkBoat { diff --git a/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoatDispenseItemBehavior.java b/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoatDispenseItemBehavior.java index a85d009d53..4dae150329 100644 --- a/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoatDispenseItemBehavior.java +++ b/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoatDispenseItemBehavior.java @@ -10,11 +10,10 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.DispenserBlock; import net.minecraft.world.level.block.LevelEvent; +import org.violetmoon.quark.base.handler.WoodSetHandler; import javax.annotation.Nonnull; -import org.violetmoon.quark.base.handler.WoodSetHandler; - // Pretty much just a copy of BoatDispenseItemBehavior but for the quark boat public class QuarkBoatDispenseItemBehavior extends DefaultDispenseItemBehavior { diff --git a/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoatItem.java b/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoatItem.java index 4340431c63..aa805f8887 100644 --- a/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoatItem.java +++ b/src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoatItem.java @@ -1,14 +1,5 @@ package org.violetmoon.quark.base.item.boat; -import java.util.List; -import java.util.function.Predicate; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.handler.WoodSetHandler; -import org.violetmoon.quark.base.item.QuarkItem; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; @@ -26,6 +17,13 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.base.handler.WoodSetHandler; +import org.violetmoon.quark.base.item.QuarkItem; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import java.util.List; +import java.util.function.Predicate; public class QuarkBoatItem extends QuarkItem { diff --git a/src/main/java/org/violetmoon/quark/base/item/boat/QuarkChestBoat.java b/src/main/java/org/violetmoon/quark/base/item/boat/QuarkChestBoat.java index 7bb6cc9bdd..1b728e33b9 100644 --- a/src/main/java/org/violetmoon/quark/base/item/boat/QuarkChestBoat.java +++ b/src/main/java/org/violetmoon/quark/base/item/boat/QuarkChestBoat.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.base.item.boat; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.handler.WoodSetHandler; -import org.violetmoon.quark.base.handler.WoodSetHandler.QuarkBoatType; - import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; @@ -17,6 +12,10 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.Level; +import org.violetmoon.quark.base.handler.WoodSetHandler; +import org.violetmoon.quark.base.handler.WoodSetHandler.QuarkBoatType; + +import javax.annotation.Nonnull; public class QuarkChestBoat extends ChestBoat implements IQuarkBoat { diff --git a/src/main/java/org/violetmoon/quark/base/network/QuarkNetwork.java b/src/main/java/org/violetmoon/quark/base/network/QuarkNetwork.java index 166d55fc14..983ff8032c 100644 --- a/src/main/java/org/violetmoon/quark/base/network/QuarkNetwork.java +++ b/src/main/java/org/violetmoon/quark/base/network/QuarkNetwork.java @@ -12,12 +12,6 @@ import net.minecraftforge.network.NetworkDirection; import net.minecraftforge.network.NetworkEvent; import net.minecraftforge.network.simple.SimpleChannel; - -import java.time.Instant; -import java.util.BitSet; -import java.util.function.BiConsumer; -import java.util.function.Supplier; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.network.message.*; import org.violetmoon.quark.base.network.message.experimental.PlaceVariantUpdateMessage; @@ -33,6 +27,11 @@ import org.violetmoon.zeta.network.ZetaNetworkHandler; import org.violetmoon.zetaimplforge.network.ForgeZetaNetworkHandler; +import java.time.Instant; +import java.util.BitSet; +import java.util.function.BiConsumer; +import java.util.function.Supplier; + public final class QuarkNetwork { private static final int PROTOCOL_VERSION = 2; diff --git a/src/main/java/org/violetmoon/quark/base/network/message/ChangeHotbarMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/ChangeHotbarMessage.java index 2e64dea22d..92b89936a3 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/ChangeHotbarMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/ChangeHotbarMessage.java @@ -3,12 +3,11 @@ import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; - -import java.io.Serial; - import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class ChangeHotbarMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/DoEmoteMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/DoEmoteMessage.java index 3be4212a80..4108bc385c 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/DoEmoteMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/DoEmoteMessage.java @@ -5,14 +5,13 @@ import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - -import java.io.Serial; -import java.util.UUID; - import org.violetmoon.quark.content.tweaks.client.emote.EmoteHandler; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; +import java.util.UUID; + public class DoEmoteMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/DoubleDoorMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/DoubleDoorMessage.java index 80bb2e0495..8d21a3410a 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/DoubleDoorMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/DoubleDoorMessage.java @@ -3,14 +3,13 @@ import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.Level; - -import java.io.Serial; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.tweaks.module.DoubleDoorOpeningModule; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class DoubleDoorMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/HarvestMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/HarvestMessage.java index 6ffc4aa9ab..9621b2edea 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/HarvestMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/HarvestMessage.java @@ -6,13 +6,12 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.ClipContext; import net.minecraft.world.phys.BlockHitResult; - -import java.io.Serial; - import org.violetmoon.quark.content.tweaks.module.SimpleHarvestModule; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class HarvestMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/InventoryTransferMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/InventoryTransferMessage.java index bf8ac09acc..0bf70c5896 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/InventoryTransferMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/InventoryTransferMessage.java @@ -1,11 +1,11 @@ package org.violetmoon.quark.base.network.message; -import java.io.Serial; - import org.violetmoon.quark.base.handler.InventoryTransferHandler; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class InventoryTransferMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/RequestEmoteMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/RequestEmoteMessage.java index 2578d04dcb..c2b235962b 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/RequestEmoteMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/RequestEmoteMessage.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.base.network.message; import net.minecraft.server.level.ServerPlayer; - -import java.io.Serial; - import org.violetmoon.quark.base.handler.ContributorRewardHandler; import org.violetmoon.quark.base.network.QuarkNetwork; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class RequestEmoteMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/ScrollOnBundleMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/ScrollOnBundleMessage.java index 4681587917..6096650941 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/ScrollOnBundleMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/ScrollOnBundleMessage.java @@ -1,11 +1,11 @@ package org.violetmoon.quark.base.network.message; -import java.io.Serial; - import org.violetmoon.quark.content.management.module.ExpandedItemInteractionsModule; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class ScrollOnBundleMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/SetLockProfileMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/SetLockProfileMessage.java index 50ad4e79fa..6ca661d61d 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/SetLockProfileMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/SetLockProfileMessage.java @@ -1,12 +1,12 @@ package org.violetmoon.quark.base.network.message; -import java.io.Serial; - import org.violetmoon.quark.content.tweaks.module.LockRotationModule; import org.violetmoon.quark.content.tweaks.module.LockRotationModule.LockProfile; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class SetLockProfileMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/ShareItemMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/ShareItemMessage.java index db0fc2d4cc..b83cc7742d 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/ShareItemMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/ShareItemMessage.java @@ -4,14 +4,13 @@ import net.minecraft.network.chat.MessageSignature; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; - -import java.io.Serial; -import java.time.Instant; - import org.violetmoon.quark.content.management.module.ItemSharingModule; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; +import java.time.Instant; + public class ShareItemMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/SortInventoryMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/SortInventoryMessage.java index fc5ec4d118..7436af92e6 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/SortInventoryMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/SortInventoryMessage.java @@ -1,11 +1,11 @@ package org.violetmoon.quark.base.network.message; -import java.io.Serial; - import org.violetmoon.quark.base.handler.SortingHandler; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class SortInventoryMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/UpdateTridentMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/UpdateTridentMessage.java index 27c07544c7..be1ff3dacf 100755 --- a/src/main/java/org/violetmoon/quark/base/network/message/UpdateTridentMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/UpdateTridentMessage.java @@ -7,12 +7,11 @@ import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - -import java.io.Serial; - import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class UpdateTridentMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/experimental/PlaceVariantUpdateMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/experimental/PlaceVariantUpdateMessage.java index 9fe082e72e..cd95b70b62 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/experimental/PlaceVariantUpdateMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/experimental/PlaceVariantUpdateMessage.java @@ -1,11 +1,11 @@ package org.violetmoon.quark.base.network.message.experimental; -import java.io.Serial; - import org.violetmoon.quark.content.experimental.module.VariantSelectorModule; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class PlaceVariantUpdateMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/oddities/HandleBackpackMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/oddities/HandleBackpackMessage.java index d31578cf25..a179cd9936 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/oddities/HandleBackpackMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/oddities/HandleBackpackMessage.java @@ -5,13 +5,12 @@ import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ItemStack; import net.minecraftforge.network.NetworkHooks; - -import java.io.Serial; - import org.violetmoon.quark.addons.oddities.inventory.BackpackMenu; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class HandleBackpackMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/oddities/MatrixEnchanterOperationMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/oddities/MatrixEnchanterOperationMessage.java index bc83eb5ee1..68c0d416f4 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/oddities/MatrixEnchanterOperationMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/oddities/MatrixEnchanterOperationMessage.java @@ -2,14 +2,13 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; - -import java.io.Serial; - import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; import org.violetmoon.quark.addons.oddities.inventory.MatrixEnchantingMenu; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class MatrixEnchanterOperationMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/oddities/ScrollCrateMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/oddities/ScrollCrateMessage.java index 7288aa59af..f25ea120fe 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/oddities/ScrollCrateMessage.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/oddities/ScrollCrateMessage.java @@ -2,13 +2,12 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; - -import java.io.Serial; - import org.violetmoon.quark.addons.oddities.inventory.CrateMenu; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; + public class ScrollCrateMessage implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/structural/C2SLoginFlag.java b/src/main/java/org/violetmoon/quark/base/network/message/structural/C2SLoginFlag.java index 0d46271ad4..4424a1bc0d 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/structural/C2SLoginFlag.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/structural/C2SLoginFlag.java @@ -2,12 +2,11 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; +import org.violetmoon.quark.base.config.SyncedFlagHandler; import java.util.BitSet; import java.util.function.BiConsumer; -import org.violetmoon.quark.base.config.SyncedFlagHandler; - public class C2SLoginFlag extends HandshakeMessage { public BitSet flags; diff --git a/src/main/java/org/violetmoon/quark/base/network/message/structural/C2SUpdateFlag.java b/src/main/java/org/violetmoon/quark/base/network/message/structural/C2SUpdateFlag.java index 581174e29d..1611d4278f 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/structural/C2SUpdateFlag.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/structural/C2SUpdateFlag.java @@ -1,12 +1,12 @@ package org.violetmoon.quark.base.network.message.structural; -import java.io.Serial; -import java.util.BitSet; - import org.violetmoon.quark.base.config.SyncedFlagHandler; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; +import java.util.BitSet; + public class C2SUpdateFlag implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/network/message/structural/S2CUpdateFlag.java b/src/main/java/org/violetmoon/quark/base/network/message/structural/S2CUpdateFlag.java index 3717f44c80..cbec4b86e4 100644 --- a/src/main/java/org/violetmoon/quark/base/network/message/structural/S2CUpdateFlag.java +++ b/src/main/java/org/violetmoon/quark/base/network/message/structural/S2CUpdateFlag.java @@ -1,12 +1,12 @@ package org.violetmoon.quark.base.network.message.structural; -import java.io.Serial; -import java.util.BitSet; - import org.violetmoon.quark.base.config.SyncedFlagHandler; import org.violetmoon.zeta.network.IZetaMessage; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.io.Serial; +import java.util.BitSet; + public class S2CUpdateFlag implements IZetaMessage { @Serial diff --git a/src/main/java/org/violetmoon/quark/base/proxy/ClientProxy.java b/src/main/java/org/violetmoon/quark/base/proxy/ClientProxy.java index bd133cac56..9f72659f9a 100644 --- a/src/main/java/org/violetmoon/quark/base/proxy/ClientProxy.java +++ b/src/main/java/org/violetmoon/quark/base/proxy/ClientProxy.java @@ -14,14 +14,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory; import net.minecraftforge.fml.ModLoadingContext; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.time.LocalDateTime; -import java.time.Month; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.QuarkClient; import org.violetmoon.quark.base.client.config.QButtonHandler; @@ -37,7 +29,13 @@ import org.violetmoon.quark.base.network.message.structural.C2SUpdateFlag; import org.violetmoon.quark.mixin.client.accessor.AccessorMultiPlayerGameMode; import org.violetmoon.zeta.client.TopLayerTooltipHandler; -import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.time.Month; @OnlyIn(Dist.CLIENT) public class ClientProxy extends CommonProxy { diff --git a/src/main/java/org/violetmoon/quark/base/proxy/CommonProxy.java b/src/main/java/org/violetmoon/quark/base/proxy/CommonProxy.java index 0e8e61d6a0..1f8247c76e 100644 --- a/src/main/java/org/violetmoon/quark/base/proxy/CommonProxy.java +++ b/src/main/java/org/violetmoon/quark/base/proxy/CommonProxy.java @@ -1,29 +1,23 @@ package org.violetmoon.quark.base.proxy; -import java.time.LocalDateTime; -import java.time.Month; -import java.util.List; - +import net.minecraft.core.Registry; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.event.config.ModConfigEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.violetmoon.quark.QuarkForgeCapabilities; -import org.violetmoon.quark.api.ICustomSorting; -import org.violetmoon.quark.api.IMagnetTracker; -import org.violetmoon.quark.api.IPistonCallback; -import org.violetmoon.quark.api.IRuneColorProvider; -import org.violetmoon.quark.api.ITransferManager; -import org.violetmoon.quark.api.QuarkCapabilities; +import org.violetmoon.quark.api.*; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.capability.CapabilityHandler; import org.violetmoon.quark.base.config.SyncedFlagHandler; -import org.violetmoon.quark.base.handler.ContributorRewardHandler; -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.quark.base.handler.EntityAttributeHandler; -import org.violetmoon.quark.base.handler.FuelHandler; -import org.violetmoon.quark.base.handler.GeneralConfig; -import org.violetmoon.quark.base.handler.QuarkSounds; -import org.violetmoon.quark.base.handler.RecipeCrawlHandler; -import org.violetmoon.quark.base.handler.ToolInteractionHandler; -import org.violetmoon.quark.base.handler.UndergroundBiomeHandler; -import org.violetmoon.quark.base.handler.WoodSetHandler; +import org.violetmoon.quark.base.handler.*; import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; import org.violetmoon.quark.base.network.QuarkNetwork; import org.violetmoon.quark.base.recipe.ExclusionRecipe; @@ -36,18 +30,9 @@ import org.violetmoon.zeta.module.ZetaCategory; import org.violetmoon.zetaimplforge.module.ModFileScanDataModuleFinder; -import net.minecraft.core.Registry; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.Level; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.event.config.ModConfigEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import java.time.LocalDateTime; +import java.time.Month; +import java.util.List; public class CommonProxy { diff --git a/src/main/java/org/violetmoon/quark/base/recipe/ExclusionRecipe.java b/src/main/java/org/violetmoon/quark/base/recipe/ExclusionRecipe.java index 9e33195f12..99cbd9459e 100644 --- a/src/main/java/org/violetmoon/quark/base/recipe/ExclusionRecipe.java +++ b/src/main/java/org/violetmoon/quark/base/recipe/ExclusionRecipe.java @@ -1,17 +1,9 @@ package org.violetmoon.quark.base.recipe; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - -import javax.annotation.Nonnull; - import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; - import net.minecraft.core.NonNullList; import net.minecraft.core.Registry; import net.minecraft.network.FriendlyByteBuf; @@ -19,14 +11,16 @@ import net.minecraft.util.GsonHelper; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.CraftingRecipe; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.Recipe; -import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.item.crafting.*; import net.minecraft.world.level.Level; import net.minecraftforge.common.crafting.IShapedRecipe; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + /** * @author WireSegal * Created at 2:08 PM on 8/24/19. diff --git a/src/main/java/org/violetmoon/quark/base/util/IfFlagGoal.java b/src/main/java/org/violetmoon/quark/base/util/IfFlagGoal.java index 5ef3b034cd..1ff94a7666 100644 --- a/src/main/java/org/violetmoon/quark/base/util/IfFlagGoal.java +++ b/src/main/java/org/violetmoon/quark/base/util/IfFlagGoal.java @@ -1,11 +1,10 @@ package org.violetmoon.quark.base.util; -import java.util.EnumSet; -import java.util.function.BooleanSupplier; +import net.minecraft.world.entity.ai.goal.Goal; import javax.annotation.Nonnull; - -import net.minecraft.world.entity.ai.goal.Goal; +import java.util.EnumSet; +import java.util.function.BooleanSupplier; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/base/util/InventoryIIH.java b/src/main/java/org/violetmoon/quark/base/util/InventoryIIH.java index 9232462132..205ba0f8c0 100644 --- a/src/main/java/org/violetmoon/quark/base/util/InventoryIIH.java +++ b/src/main/java/org/violetmoon/quark/base/util/InventoryIIH.java @@ -1,13 +1,13 @@ package org.violetmoon.quark.base.util; -import javax.annotation.Nonnull; - import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; +import javax.annotation.Nonnull; + //formerly from AutoRegLib public class InventoryIIH implements IItemHandlerModifiable { diff --git a/src/main/java/org/violetmoon/quark/base/util/QuarkEffect.java b/src/main/java/org/violetmoon/quark/base/util/QuarkEffect.java index f09da49291..dcc41156fc 100755 --- a/src/main/java/org/violetmoon/quark/base/util/QuarkEffect.java +++ b/src/main/java/org/violetmoon/quark/base/util/QuarkEffect.java @@ -10,11 +10,10 @@ */ package org.violetmoon.quark.base.util; -import org.violetmoon.quark.base.Quark; - import net.minecraft.core.Registry; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; +import org.violetmoon.quark.base.Quark; public class QuarkEffect extends MobEffect { diff --git a/src/main/java/org/violetmoon/quark/base/util/SimpleInventoryBlockEntity.java b/src/main/java/org/violetmoon/quark/base/util/SimpleInventoryBlockEntity.java index cb6456e454..f7b64ea45c 100644 --- a/src/main/java/org/violetmoon/quark/base/util/SimpleInventoryBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/base/util/SimpleInventoryBlockEntity.java @@ -10,10 +10,6 @@ */ package org.violetmoon.quark.base.util; -import javax.annotation.Nonnull; - -import org.violetmoon.zeta.block.be.ZetaBlockEntity; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; @@ -28,6 +24,9 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.wrapper.SidedInvWrapper; +import org.violetmoon.zeta.block.be.ZetaBlockEntity; + +import javax.annotation.Nonnull; //formerly from AutoRegLib public abstract class SimpleInventoryBlockEntity extends ZetaBlockEntity implements WorldlyContainer { diff --git a/src/main/java/org/violetmoon/quark/base/world/DeferredFeature.java b/src/main/java/org/violetmoon/quark/base/world/DeferredFeature.java index 6f8bbe75a2..e414760557 100644 --- a/src/main/java/org/violetmoon/quark/base/world/DeferredFeature.java +++ b/src/main/java/org/violetmoon/quark/base/world/DeferredFeature.java @@ -1,12 +1,12 @@ package org.violetmoon.quark.base.world; -import javax.annotation.Nonnull; - import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import javax.annotation.Nonnull; + public class DeferredFeature extends Feature { private final GenerationStep.Decoration stage; diff --git a/src/main/java/org/violetmoon/quark/base/world/EntitySpawnHandler.java b/src/main/java/org/violetmoon/quark/base/world/EntitySpawnHandler.java index a8d97d0ecd..885fcc61ea 100644 --- a/src/main/java/org/violetmoon/quark/base/world/EntitySpawnHandler.java +++ b/src/main/java/org/violetmoon/quark/base/world/EntitySpawnHandler.java @@ -1,17 +1,5 @@ package org.violetmoon.quark.base.world; -import java.util.LinkedList; -import java.util.List; -import java.util.function.BooleanSupplier; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.config.type.CostSensitiveEntitySpawnConfig; -import org.violetmoon.quark.base.config.type.EntitySpawnConfig; -import org.violetmoon.quark.base.item.QuarkSpawnEggItem; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZConfigChanged; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.Holder; import net.minecraft.core.Registry; import net.minecraft.world.entity.EntityType; @@ -27,6 +15,17 @@ import net.minecraft.world.level.levelgen.Heightmap; import net.minecraftforge.common.world.MobSpawnSettingsBuilder; import net.minecraftforge.common.world.ModifiableBiomeInfo; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.config.type.CostSensitiveEntitySpawnConfig; +import org.violetmoon.quark.base.config.type.EntitySpawnConfig; +import org.violetmoon.quark.base.item.QuarkSpawnEggItem; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZConfigChanged; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.LinkedList; +import java.util.List; +import java.util.function.BooleanSupplier; public class EntitySpawnHandler { diff --git a/src/main/java/org/violetmoon/quark/base/world/WeightedGenerator.java b/src/main/java/org/violetmoon/quark/base/world/WeightedGenerator.java index ecb2a1b4ec..339bda26f9 100644 --- a/src/main/java/org/violetmoon/quark/base/world/WeightedGenerator.java +++ b/src/main/java/org/violetmoon/quark/base/world/WeightedGenerator.java @@ -1,10 +1,10 @@ package org.violetmoon.quark.base.world; -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.world.generator.IGenerator; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + public record WeightedGenerator(ZetaModule module, IGenerator generator, int weight) implements Comparable { diff --git a/src/main/java/org/violetmoon/quark/base/world/WorldGenHandler.java b/src/main/java/org/violetmoon/quark/base/world/WorldGenHandler.java index 1d98e03bb5..60aa249126 100644 --- a/src/main/java/org/violetmoon/quark/base/world/WorldGenHandler.java +++ b/src/main/java/org/violetmoon/quark/base/world/WorldGenHandler.java @@ -1,26 +1,6 @@ package org.violetmoon.quark.base.world; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.GeneralConfig; -import org.violetmoon.quark.base.world.generator.IGenerator; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.module.ZetaModule; - import com.mojang.serialization.Codec; - import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.Registry; @@ -48,6 +28,15 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.GeneralConfig; +import org.violetmoon.quark.base.world.generator.IGenerator; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.*; +import java.util.concurrent.*; public class WorldGenHandler { diff --git a/src/main/java/org/violetmoon/quark/base/world/generator/CombinedGenerator.java b/src/main/java/org/violetmoon/quark/base/world/generator/CombinedGenerator.java index a439248c28..c9c872410f 100644 --- a/src/main/java/org/violetmoon/quark/base/world/generator/CombinedGenerator.java +++ b/src/main/java/org/violetmoon/quark/base/world/generator/CombinedGenerator.java @@ -1,7 +1,5 @@ package org.violetmoon.quark.base.world.generator; -import java.util.List; - import net.minecraft.core.BlockPos; import net.minecraft.server.level.WorldGenRegion; import net.minecraft.world.level.ServerLevelAccessor; @@ -9,6 +7,8 @@ import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.WorldgenRandom; +import java.util.List; + /** * @author WireSegal * Created at 9:02 PM on 10/1/19. diff --git a/src/main/java/org/violetmoon/quark/base/world/generator/Generator.java b/src/main/java/org/violetmoon/quark/base/world/generator/Generator.java index 3ab050b9dd..5be4f3022f 100644 --- a/src/main/java/org/violetmoon/quark/base/world/generator/Generator.java +++ b/src/main/java/org/violetmoon/quark/base/world/generator/Generator.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.base.world.generator; -import java.util.function.BooleanSupplier; - -import org.violetmoon.quark.base.config.type.DimensionConfig; - import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.server.level.WorldGenRegion; @@ -14,6 +10,9 @@ import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.WorldgenRandom; +import org.violetmoon.quark.base.config.type.DimensionConfig; + +import java.util.function.BooleanSupplier; public abstract class Generator implements IGenerator { diff --git a/src/main/java/org/violetmoon/quark/base/world/generator/OreGenerator.java b/src/main/java/org/violetmoon/quark/base/world/generator/OreGenerator.java index b443bb4986..0e40d8f7ee 100644 --- a/src/main/java/org/violetmoon/quark/base/world/generator/OreGenerator.java +++ b/src/main/java/org/violetmoon/quark/base/world/generator/OreGenerator.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.base.world.generator; -import java.util.BitSet; -import java.util.function.BooleanSupplier; -import java.util.function.Predicate; - -import org.violetmoon.quark.base.config.type.DimensionConfig; -import org.violetmoon.quark.base.config.type.OrePocketConfig; - import net.minecraft.core.BlockPos; import net.minecraft.server.level.WorldGenRegion; import net.minecraft.util.Mth; @@ -17,6 +10,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.levelgen.Heightmap; +import org.violetmoon.quark.base.config.type.DimensionConfig; +import org.violetmoon.quark.base.config.type.OrePocketConfig; + +import java.util.BitSet; +import java.util.function.BooleanSupplier; +import java.util.function.Predicate; public class OreGenerator extends Generator { diff --git a/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/ClusterBasedGenerator.java b/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/ClusterBasedGenerator.java index 7d7bf0b067..bd2d4edc8b 100644 --- a/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/ClusterBasedGenerator.java +++ b/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/ClusterBasedGenerator.java @@ -3,14 +3,13 @@ import net.minecraft.core.BlockPos; import net.minecraft.server.level.WorldGenRegion; import net.minecraft.world.level.chunk.ChunkGenerator; - -import java.util.Random; -import java.util.function.BooleanSupplier; - import org.violetmoon.quark.base.config.type.ClusterSizeConfig; import org.violetmoon.quark.base.config.type.DimensionConfig; import org.violetmoon.quark.base.world.generator.Generator; +import java.util.Random; +import java.util.function.BooleanSupplier; + public abstract class ClusterBasedGenerator extends MultiChunkFeatureGenerator { public final ClusterShape.Provider shapeProvider; diff --git a/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/ClusterShape.java b/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/ClusterShape.java index 4775a05c29..69e1a6f947 100644 --- a/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/ClusterShape.java +++ b/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/ClusterShape.java @@ -6,13 +6,12 @@ import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise; import net.minecraft.world.phys.Vec3; - -import java.util.Random; - import org.violetmoon.quark.base.config.type.ClusterSizeConfig; import org.violetmoon.quark.base.config.type.IBiomeConfig; import org.violetmoon.quark.base.handler.GeneralConfig; +import java.util.Random; + public record ClusterShape(BlockPos src, Vec3 radius, PerlinSimplexNoise noiseGenerator) { diff --git a/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/MultiChunkFeatureGenerator.java b/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/MultiChunkFeatureGenerator.java index 844e4d2490..db2db0ad40 100644 --- a/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/MultiChunkFeatureGenerator.java +++ b/src/main/java/org/violetmoon/quark/base/world/generator/multichunk/MultiChunkFeatureGenerator.java @@ -1,17 +1,16 @@ package org.violetmoon.quark.base.world.generator.multichunk; -import java.util.Random; -import java.util.function.BooleanSupplier; -import java.util.function.Consumer; - -import org.violetmoon.quark.base.config.type.DimensionConfig; -import org.violetmoon.quark.base.world.generator.Generator; - import net.minecraft.core.BlockPos; import net.minecraft.server.level.WorldGenRegion; import net.minecraft.util.RandomSource; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.chunk.ChunkGenerator; +import org.violetmoon.quark.base.config.type.DimensionConfig; +import org.violetmoon.quark.base.world.generator.Generator; + +import java.util.Random; +import java.util.function.BooleanSupplier; +import java.util.function.Consumer; public abstract class MultiChunkFeatureGenerator extends Generator { diff --git a/src/main/java/org/violetmoon/quark/content/automation/base/RandomizerPowerState.java b/src/main/java/org/violetmoon/quark/content/automation/base/RandomizerPowerState.java index 9d233f1b14..51e8f877ae 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/base/RandomizerPowerState.java +++ b/src/main/java/org/violetmoon/quark/content/automation/base/RandomizerPowerState.java @@ -1,10 +1,9 @@ package org.violetmoon.quark.content.automation.base; -import java.util.Locale; - import net.minecraft.util.StringRepresentable; import javax.annotation.Nonnull; +import java.util.Locale; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/ChuteBlock.java b/src/main/java/org/violetmoon/quark/content/automation/block/ChuteBlock.java index ea32931959..cacaaca644 100755 --- a/src/main/java/org/violetmoon/quark/content/automation/block/ChuteBlock.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/ChuteBlock.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.automation.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.quark.content.automation.block.be.ChuteBlockEntity; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; @@ -23,6 +16,12 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.quark.content.automation.block.be.ChuteBlockEntity; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nonnull; public class ChuteBlock extends QuarkBlock implements EntityBlock { diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/EnderWatcherBlock.java b/src/main/java/org/violetmoon/quark/content/automation/block/EnderWatcherBlock.java index 26168396c9..38957ec508 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/block/EnderWatcherBlock.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/EnderWatcherBlock.java @@ -18,14 +18,13 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.content.automation.block.be.EnderWatcherBlockEntity; import org.violetmoon.quark.content.automation.module.EnderWatcherModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + public class EnderWatcherBlock extends QuarkBlock implements EntityBlock { public static final BooleanProperty WATCHED = BooleanProperty.create("watched"); diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/FeedingTroughBlock.java b/src/main/java/org/violetmoon/quark/content/automation/block/FeedingTroughBlock.java index fc5708a034..d880301a86 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/block/FeedingTroughBlock.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/FeedingTroughBlock.java @@ -27,15 +27,14 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.*; import net.minecraftforge.common.util.ForgeSoundType; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.content.automation.block.be.FeedingTroughBlockEntity; import org.violetmoon.quark.content.automation.module.FeedingTroughModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + /** * @author WireSegal * Created at 9:39 AM on 9/20/19. diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/GravisandBlock.java b/src/main/java/org/violetmoon/quark/content/automation/block/GravisandBlock.java index 78fecd826a..123024757f 100755 --- a/src/main/java/org/violetmoon/quark/content/automation/block/GravisandBlock.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/GravisandBlock.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.automation.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.quark.content.automation.entity.Gravisand; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; @@ -17,6 +11,11 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.quark.content.automation.entity.Gravisand; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class GravisandBlock extends QuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/IronRodBlock.java b/src/main/java/org/violetmoon/quark/content/automation/block/IronRodBlock.java index 7945397038..d60eda5af2 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/block/IronRodBlock.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/IronRodBlock.java @@ -15,10 +15,6 @@ import net.minecraft.world.level.block.state.StateDefinition.Builder; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.material.Material; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.handler.CreativeTabHandler; import org.violetmoon.quark.content.automation.module.IronRodModule; @@ -26,6 +22,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.RenderLayerRegistry; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.BooleanSupplier; public class IronRodBlock extends EndRodBlock implements ICollateralMover, IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/MetalButtonBlock.java b/src/main/java/org/violetmoon/quark/content/automation/block/MetalButtonBlock.java index 40879ef48e..b2ce6a7be9 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/block/MetalButtonBlock.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/MetalButtonBlock.java @@ -1,16 +1,15 @@ package org.violetmoon.quark.content.automation.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkButtonBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; +import org.violetmoon.quark.base.block.QuarkButtonBlock; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/ObsidianPressurePlateBlock.java b/src/main/java/org/violetmoon/quark/content/automation/block/ObsidianPressurePlateBlock.java index 7c95af5fd1..007aed7bc3 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/block/ObsidianPressurePlateBlock.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/ObsidianPressurePlateBlock.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.automation.block; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkPressurePlateBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -18,6 +11,11 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.phys.AABB; +import org.violetmoon.quark.base.block.QuarkPressurePlateBlock; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import java.util.List; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/RedstoneRandomizerBlock.java b/src/main/java/org/violetmoon/quark/content/automation/block/RedstoneRandomizerBlock.java index 7457404238..7baac1a283 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/block/RedstoneRandomizerBlock.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/RedstoneRandomizerBlock.java @@ -1,14 +1,5 @@ package org.violetmoon.quark.content.automation.block; -import java.util.EnumSet; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.quark.content.automation.base.RandomizerPowerState; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.DustParticleOptions; @@ -35,6 +26,13 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.ForgeEventFactory; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.quark.content.automation.base.RandomizerPowerState; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nonnull; +import java.util.EnumSet; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/be/ChuteBlockEntity.java b/src/main/java/org/violetmoon/quark/content/automation/block/be/ChuteBlockEntity.java index 41288f4a23..fb5d38fdf8 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/block/be/ChuteBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/be/ChuteBlockEntity.java @@ -9,15 +9,14 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.content.automation.block.ChuteBlock; import org.violetmoon.quark.content.automation.module.ChuteModule; import org.violetmoon.quark.content.building.module.GrateModule; import org.violetmoon.zeta.block.be.ZetaBlockEntity; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + /** * @author WireSegal * Created at 10:18 AM on 9/29/19. diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/be/EnderWatcherBlockEntity.java b/src/main/java/org/violetmoon/quark/content/automation/block/be/EnderWatcherBlockEntity.java index 81924eb4ec..488d7272f6 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/block/be/EnderWatcherBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/be/EnderWatcherBlockEntity.java @@ -18,15 +18,14 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; - -import java.util.List; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.RayTraceHandler; import org.violetmoon.quark.content.automation.block.EnderWatcherBlock; import org.violetmoon.quark.content.automation.module.EnderWatcherModule; import org.violetmoon.zeta.block.be.ZetaBlockEntity; +import java.util.List; + public class EnderWatcherBlockEntity extends ZetaBlockEntity { public EnderWatcherBlockEntity(BlockPos pos, BlockState state) { diff --git a/src/main/java/org/violetmoon/quark/content/automation/block/be/FeedingTroughBlockEntity.java b/src/main/java/org/violetmoon/quark/content/automation/block/be/FeedingTroughBlockEntity.java index 78ceb907e5..8969350b66 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/block/be/FeedingTroughBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/content/automation/block/be/FeedingTroughBlockEntity.java @@ -1,17 +1,6 @@ package org.violetmoon.quark.content.automation.block.be; -import java.util.List; -import java.util.Random; -import java.util.UUID; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.content.automation.block.FeedingTroughBlock; -import org.violetmoon.quark.content.automation.module.FeedingTroughModule; - import com.mojang.authlib.GameProfile; - import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.core.particles.ItemParticleOption; @@ -36,6 +25,14 @@ import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.content.automation.block.FeedingTroughBlock; +import org.violetmoon.quark.content.automation.module.FeedingTroughModule; + +import javax.annotation.Nonnull; +import java.util.List; +import java.util.Random; +import java.util.UUID; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/automation/client/render/QuarkPistonBlockEntityRenderer.java b/src/main/java/org/violetmoon/quark/content/automation/client/render/QuarkPistonBlockEntityRenderer.java index 19c83f7db0..ea62ed2c9f 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/client/render/QuarkPistonBlockEntityRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/automation/client/render/QuarkPistonBlockEntityRenderer.java @@ -1,12 +1,6 @@ package org.violetmoon.quark.content.automation.client.render; -import java.util.Objects; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.content.automation.module.PistonsMoveTileEntitiesModule; - import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; @@ -23,6 +17,10 @@ import net.minecraft.world.level.block.piston.PistonMovingBlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.content.automation.module.PistonsMoveTileEntitiesModule; + +import java.util.Objects; public class QuarkPistonBlockEntityRenderer { diff --git a/src/main/java/org/violetmoon/quark/content/automation/entity/Gravisand.java b/src/main/java/org/violetmoon/quark/content/automation/entity/Gravisand.java index 557485b471..d845f9b326 100755 --- a/src/main/java/org/violetmoon/quark/content/automation/entity/Gravisand.java +++ b/src/main/java/org/violetmoon/quark/content/automation/entity/Gravisand.java @@ -22,11 +22,10 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.content.automation.module.GravisandModule; import javax.annotation.Nonnull; -import org.violetmoon.quark.content.automation.module.GravisandModule; - public class Gravisand extends FallingBlockEntity { private static final EntityDataAccessor DIRECTION = SynchedEntityData.defineId(Gravisand.class, diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/ChuteModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/ChuteModule.java index 14ca9dfc91..72f1bd1851 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/ChuteModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/ChuteModule.java @@ -1,5 +1,11 @@ package org.violetmoon.quark.content.automation.module; +import net.minecraft.core.Registry; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.material.Material; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.automation.block.ChuteBlock; import org.violetmoon.quark.content.automation.block.be.ChuteBlockEntity; @@ -9,13 +15,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.core.Registry; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.material.Material; - /** * @author WireSegal * Created at 10:25 AM on 9/29/19. diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/DispensersPlaceBlocksModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/DispensersPlaceBlocksModule.java index 5e51a16d24..94d59f8aaf 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/DispensersPlaceBlocksModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/DispensersPlaceBlocksModule.java @@ -19,15 +19,13 @@ import net.minecraft.world.level.block.DispenserBlock; import net.minecraft.world.level.block.SlabBlock; import net.minecraft.world.level.block.StairBlock; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZCommonSetup; import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/EnderWatcherModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/EnderWatcherModule.java index c74cfe52a8..9b2d24a5ab 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/EnderWatcherModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/EnderWatcherModule.java @@ -1,5 +1,8 @@ package org.violetmoon.quark.content.automation.module; +import net.minecraft.core.Registry; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntityType; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; import org.violetmoon.quark.base.handler.advancement.QuarkGenericTrigger; @@ -11,10 +14,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.core.Registry; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; - @ZetaLoadModule(category = "automation") public class EnderWatcherModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/FeedingTroughModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/FeedingTroughModule.java index b04bfe6691..56fff08a17 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/FeedingTroughModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/FeedingTroughModule.java @@ -29,9 +29,6 @@ import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.util.FakePlayer; - -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.automation.block.FeedingTroughBlock; @@ -45,6 +42,7 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import javax.annotation.Nullable; import java.util.Set; import java.util.function.Predicate; diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/GravisandModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/GravisandModule.java index f73b7c1b78..9f3843a9f8 100755 --- a/src/main/java/org/violetmoon/quark/content/automation/module/GravisandModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/GravisandModule.java @@ -1,5 +1,13 @@ package org.violetmoon.quark.content.automation.module; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.client.renderer.entity.FallingBlockRenderer; +import net.minecraft.core.Registry; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.automation.block.GravisandBlock; import org.violetmoon.quark.content.automation.entity.Gravisand; @@ -10,15 +18,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.client.renderer.entity.FallingBlockRenderer; -import net.minecraft.core.Registry; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; - @ZetaLoadModule(category = "automation") public class GravisandModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/IronRodModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/IronRodModule.java index 610ba94776..32af0f521c 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/IronRodModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/IronRodModule.java @@ -1,5 +1,9 @@ package org.violetmoon.quark.content.automation.module; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.automation.block.IronRodBlock; @@ -10,11 +14,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.block.Block; - @ZetaLoadModule(category = "automation") public class IronRodModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/JukeboxAutomationModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/JukeboxAutomationModule.java index c1501335d8..c8b26103a0 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/JukeboxAutomationModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/JukeboxAutomationModule.java @@ -22,9 +22,6 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; @@ -34,6 +31,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import javax.annotation.Nonnull; + @ZetaLoadModule(category = "automation") public class JukeboxAutomationModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/MetalButtonsModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/MetalButtonsModule.java index d939df28b8..2d804d6530 100755 --- a/src/main/java/org/violetmoon/quark/content/automation/module/MetalButtonsModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/MetalButtonsModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.automation.module; +import net.minecraft.world.level.block.Block; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.automation.block.MetalButtonBlock; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -8,8 +9,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.world.level.block.Block; - @ZetaLoadModule(category = "automation") public class MetalButtonsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/ObsidianPlateModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/ObsidianPlateModule.java index c2ff59f678..bc237cff8a 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/ObsidianPlateModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/ObsidianPlateModule.java @@ -1,16 +1,15 @@ package org.violetmoon.quark.content.automation.module; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.material.MaterialColor; import org.violetmoon.quark.content.automation.block.ObsidianPressurePlateBlock; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZRegister; import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.material.MaterialColor; - /** * @author WireSegal * Created at 9:51 PM on 10/8/19. diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/RedstoneRandomizerModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/RedstoneRandomizerModule.java index 28884b8fa4..1ed0e6e71c 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/RedstoneRandomizerModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/RedstoneRandomizerModule.java @@ -1,5 +1,9 @@ package org.violetmoon.quark.content.automation.module; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.Material; import org.violetmoon.quark.content.automation.block.RedstoneRandomizerBlock; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZRegister; @@ -7,11 +11,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.material.Material; - /** * @author WireSegal * Created at 10:34 AM on 8/26/19. diff --git a/src/main/java/org/violetmoon/quark/content/building/block/BambooMatBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/BambooMatBlock.java index c0efa9cce4..5c9be686fc 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/BambooMatBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/BambooMatBlock.java @@ -1,8 +1,5 @@ package org.violetmoon.quark.content.building.block; -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; @@ -15,6 +12,8 @@ import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.zeta.module.ZetaModule; public class BambooMatBlock extends QuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/BambooMatCarpetBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/BambooMatCarpetBlock.java index 337760081a..58a6f96cf0 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/BambooMatCarpetBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/BambooMatCarpetBlock.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.content.building.block; -import javax.annotation.Nonnull; - -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; @@ -18,6 +14,9 @@ import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class BambooMatCarpetBlock extends BambooMatBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/CutVineBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/CutVineBlock.java index 041b02313f..23f234d15b 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/CutVineBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/CutVineBlock.java @@ -1,22 +1,20 @@ package org.violetmoon.quark.content.building.block; -import javax.annotation.Nonnull; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.phys.HitResult; import org.jetbrains.annotations.Nullable; import org.violetmoon.quark.base.block.QuarkVineBlock; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.IZetaBlockColorProvider; +import javax.annotation.Nonnull; + public class CutVineBlock extends QuarkVineBlock implements IZetaBlockColorProvider { public CutVineBlock(ZetaModule module) { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/GrateBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/GrateBlock.java index a50edb2b83..5fe7355e6d 100755 --- a/src/main/java/org/violetmoon/quark/content/building/block/GrateBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/GrateBlock.java @@ -6,9 +6,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.FluidTags; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ExperienceOrb; -import net.minecraft.world.entity.SpawnPlacements; import net.minecraft.world.entity.animal.Animal; import net.minecraft.world.entity.animal.WaterAnimal; import net.minecraft.world.entity.item.ItemEntity; @@ -35,15 +33,14 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.event.ForgeEventFactory; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.api.ICrawlSpaceBlock; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.block.SimpleFluidloggedBlock; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.RenderLayerRegistry; +import javax.annotation.Nonnull; + public class GrateBlock extends QuarkBlock implements SimpleFluidloggedBlock, ICrawlSpaceBlock { private static final VoxelShape TRUE_SHAPE = box(0, 15, 0, 16, 16, 16); private static final Float2ObjectArrayMap WALK_BLOCK_CACHE = new Float2ObjectArrayMap<>(); diff --git a/src/main/java/org/violetmoon/quark/content/building/block/HedgeBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/HedgeBlock.java index b19f8bee30..0ad90ed6ac 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/HedgeBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/HedgeBlock.java @@ -1,11 +1,6 @@ package org.violetmoon.quark.content.building.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.minecraft.core.BlockPos; @@ -27,8 +22,6 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.PlantType; import org.jetbrains.annotations.Nullable; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.IQuarkBlock; @@ -39,6 +32,9 @@ import org.violetmoon.zeta.registry.IZetaBlockColorProvider; import org.violetmoon.zeta.registry.RenderLayerRegistry; +import javax.annotation.Nonnull; +import java.util.function.BooleanSupplier; + //TODO ZETA: extend QuarkFenceBlock public class HedgeBlock extends FenceBlock implements IQuarkBlock, IZetaBlockColorProvider { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/HollowFrameBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/HollowFrameBlock.java index 4c1d14bab6..db0741d493 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/HollowFrameBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/HollowFrameBlock.java @@ -19,13 +19,12 @@ import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.*; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.api.ICrawlSpaceBlock; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + public abstract class HollowFrameBlock extends QuarkBlock implements SimpleWaterloggedBlock, ICrawlSpaceBlock { public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; diff --git a/src/main/java/org/violetmoon/quark/content/building/block/HollowLogBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/HollowLogBlock.java index 0755c9336e..731ff585c6 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/HollowLogBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/HollowLogBlock.java @@ -1,16 +1,15 @@ package org.violetmoon.quark.content.building.block; -import org.violetmoon.quark.base.block.IQuarkBlock; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.block.IQuarkBlock; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.RenderLayerRegistry; public class HollowLogBlock extends HollowPillarBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/HollowPillarBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/HollowPillarBlock.java index 9a19824a72..44248dc3b2 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/HollowPillarBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/HollowPillarBlock.java @@ -22,13 +22,12 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.api.ICrawlSpaceBlock; import org.violetmoon.quark.base.block.QuarkPillarBlock; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + public class HollowPillarBlock extends QuarkPillarBlock implements SimpleWaterloggedBlock, ICrawlSpaceBlock { public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; diff --git a/src/main/java/org/violetmoon/quark/content/building/block/HollowWoodBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/HollowWoodBlock.java index 69e5912c43..689a294015 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/HollowWoodBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/HollowWoodBlock.java @@ -5,7 +5,6 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Mirror; import net.minecraft.world.level.block.Rotation; @@ -14,18 +13,16 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.common.ToolAction; -import net.minecraftforge.common.ToolActions; import org.jetbrains.annotations.Nullable; import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.handler.MiscUtil; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.RenderLayerRegistry; -import static org.violetmoon.quark.base.handler.MiscUtil.directionProperty; - import javax.annotation.Nonnull; +import static org.violetmoon.quark.base.handler.MiscUtil.directionProperty; + /** * Unfortunately, due to Ladder Weirdness (tm) this block is NYI */ diff --git a/src/main/java/org/violetmoon/quark/content/building/block/LeafCarpetBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/LeafCarpetBlock.java index 3db32fdd97..f78c0d4d21 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/LeafCarpetBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/LeafCarpetBlock.java @@ -1,7 +1,5 @@ package org.violetmoon.quark.content.building.block; -import javax.annotation.Nonnull; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; @@ -24,6 +22,8 @@ import org.violetmoon.zeta.registry.IZetaBlockColorProvider; import org.violetmoon.zeta.registry.RenderLayerRegistry; +import javax.annotation.Nonnull; + public class LeafCarpetBlock extends QuarkBlock implements IZetaBlockColorProvider { private static final VoxelShape SHAPE = box(0, 0, 0, 16, 1, 16); diff --git a/src/main/java/org/violetmoon/quark/content/building/block/MudBrickLatticeBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/MudBrickLatticeBlock.java index c68ab91520..52fb22f4b0 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/MudBrickLatticeBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/MudBrickLatticeBlock.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.content.building.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkGlassBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; @@ -19,6 +14,10 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; +import org.violetmoon.quark.base.block.QuarkGlassBlock; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class MudBrickLatticeBlock extends QuarkGlassBlock implements SimpleWaterloggedBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/PaperLanternBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/PaperLanternBlock.java index c1d3cfdcab..3b00fbb9e8 100755 --- a/src/main/java/org/violetmoon/quark/content/building/block/PaperLanternBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/PaperLanternBlock.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.content.building.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; @@ -17,6 +12,10 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class PaperLanternBlock extends QuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/PaperWallBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/PaperWallBlock.java index 43803e57d6..0437c39cd3 100755 --- a/src/main/java/org/violetmoon/quark/content/building/block/PaperWallBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/PaperWallBlock.java @@ -10,14 +10,13 @@ */ package org.violetmoon.quark.content.building.block; -import org.violetmoon.quark.base.block.IQuarkBlock; -import org.violetmoon.quark.base.block.QuarkInheritedPaneBlock; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.block.IQuarkBlock; +import org.violetmoon.quark.base.block.QuarkInheritedPaneBlock; public class PaperWallBlock extends QuarkInheritedPaneBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/QuarkVerticalSlabBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/QuarkVerticalSlabBlock.java index c069c13bd4..dbbc975d97 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/QuarkVerticalSlabBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/QuarkVerticalSlabBlock.java @@ -5,10 +5,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SlabBlock; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.block.QuarkSlabBlock; @@ -16,6 +12,8 @@ import org.violetmoon.quark.base.handler.CreativeTabHandler; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.BooleanSupplier; public class QuarkVerticalSlabBlock extends VerticalSlabBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/RainbowLampBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/RainbowLampBlock.java index e1a8cee5c9..562a2f3b25 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/RainbowLampBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/RainbowLampBlock.java @@ -15,14 +15,13 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.block.QuarkGlassBlock; import org.violetmoon.quark.content.building.module.RainbowLampsModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + /** * @author WireSegal * Created at 12:31 PM on 9/19/19. diff --git a/src/main/java/org/violetmoon/quark/content/building/block/RopeBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/RopeBlock.java index fa0941b2fa..2d88e00c84 100755 --- a/src/main/java/org/violetmoon/quark/content/building/block/RopeBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/RopeBlock.java @@ -34,9 +34,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.fluids.FluidUtil; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.content.automation.module.PistonsMoveTileEntitiesModule; import org.violetmoon.quark.content.building.module.RopeModule; @@ -44,6 +41,8 @@ import org.violetmoon.zeta.registry.IZetaBlockItemProvider; import org.violetmoon.zeta.registry.RenderLayerRegistry; +import javax.annotation.Nonnull; + public class RopeBlock extends QuarkBlock implements IZetaBlockItemProvider, SimpleWaterloggedBlock { private static final VoxelShape SHAPE = box(6, 0, 6, 10, 16, 10); diff --git a/src/main/java/org/violetmoon/quark/content/building/block/SoulFurnaceBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/SoulFurnaceBlock.java index 950184de4f..7b0a75983f 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/SoulFurnaceBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/SoulFurnaceBlock.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.content.building.block; -import javax.annotation.Nonnull; - -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; @@ -19,6 +15,9 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class SoulFurnaceBlock extends VariantFurnaceBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/StoolBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/StoolBlock.java index f968c2b563..a8abd68acc 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/StoolBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/StoolBlock.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.building.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.quark.content.building.entity.Stool; -import org.violetmoon.quark.content.building.module.StoolsModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; @@ -40,6 +33,12 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.quark.content.building.entity.Stool; +import org.violetmoon.quark.content.building.module.StoolsModule; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class StoolBlock extends QuarkBlock implements SimpleWaterloggedBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/SturdyStoneBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/SturdyStoneBlock.java index b2ff9f50e7..0292f454ae 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/SturdyStoneBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/SturdyStoneBlock.java @@ -6,12 +6,11 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.PushReaction; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + public class SturdyStoneBlock extends QuarkBlock { public SturdyStoneBlock(ZetaModule module) { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/ThatchBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/ThatchBlock.java index 5caa51c8e4..6710e6747d 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/ThatchBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/ThatchBlock.java @@ -10,13 +10,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.block.QuarkFlammableBlock; import org.violetmoon.quark.content.building.module.ThatchModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + public class ThatchBlock extends QuarkFlammableBlock { public ThatchBlock(ZetaModule module) { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/VariantBookshelfBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/VariantBookshelfBlock.java index b3d0d37257..f4fe4c6052 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/VariantBookshelfBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/VariantBookshelfBlock.java @@ -1,8 +1,5 @@ package org.violetmoon.quark.content.building.block; -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.CreativeModeTab; @@ -11,6 +8,8 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.zeta.module.ZetaModule; public class VariantBookshelfBlock extends QuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/VariantChestBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/VariantChestBlock.java index 97d37bc2a7..0f4f0cb458 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/VariantChestBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/VariantChestBlock.java @@ -22,10 +22,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.extensions.common.IClientItemExtensions; import net.minecraftforge.fml.ModList; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.handler.CreativeTabHandler; @@ -34,6 +30,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.IZetaBlockItemProvider; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.BooleanSupplier; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/src/main/java/org/violetmoon/quark/content/building/block/VariantFurnaceBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/VariantFurnaceBlock.java index de231fc4e5..32fefc4c78 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/VariantFurnaceBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/VariantFurnaceBlock.java @@ -11,9 +11,6 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.handler.CreativeTabHandler; @@ -21,6 +18,7 @@ import org.violetmoon.quark.content.building.module.VariantFurnacesModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.function.BooleanSupplier; public class VariantFurnaceBlock extends FurnaceBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/VariantLadderBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/VariantLadderBlock.java index 88513ccef1..7d1e12d5ad 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/VariantLadderBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/VariantLadderBlock.java @@ -10,15 +10,13 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.LadderBlock; import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.handler.CreativeTabHandler; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.RenderLayerRegistry; +import javax.annotation.Nonnull; import java.util.function.BooleanSupplier; public class VariantLadderBlock extends LadderBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/VariantTrappedChestBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/VariantTrappedChestBlock.java index 31f2ec2417..7af366800d 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/VariantTrappedChestBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/VariantTrappedChestBlock.java @@ -21,10 +21,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.ModList; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.handler.CreativeTabHandler; @@ -33,6 +29,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.IZetaBlockItemProvider; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.BooleanSupplier; import java.util.function.Supplier; diff --git a/src/main/java/org/violetmoon/quark/content/building/block/VerticalSlabBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/VerticalSlabBlock.java index 8c110a883e..c7f1c2c1c2 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/VerticalSlabBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/VerticalSlabBlock.java @@ -28,15 +28,13 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.block.ext.IZetaBlockExtensions; import org.violetmoon.zeta.registry.IZetaBlockColorProvider; import org.violetmoon.zeta.registry.IZetaItemColorProvider; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.Supplier; /** diff --git a/src/main/java/org/violetmoon/quark/content/building/block/WeatheringCopperVerticalSlabBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/WeatheringCopperVerticalSlabBlock.java index d5f4fecd0a..50944df3e9 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/WeatheringCopperVerticalSlabBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/WeatheringCopperVerticalSlabBlock.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.content.building.block; -import java.util.Optional; - -import javax.annotation.Nonnull; - -import org.violetmoon.zeta.block.ext.CustomWeatheringCopper; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.WeatheringCopper; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.zeta.block.ext.CustomWeatheringCopper; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import java.util.Optional; public class WeatheringCopperVerticalSlabBlock extends QuarkVerticalSlabBlock implements CustomWeatheringCopper { private final WeatheringCopper.WeatherState weatherState; diff --git a/src/main/java/org/violetmoon/quark/content/building/block/WoodPostBlock.java b/src/main/java/org/violetmoon/quark/content/building/block/WoodPostBlock.java index 7fd1a95c83..d1b4a3ea20 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/WoodPostBlock.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/WoodPostBlock.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.building.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.IQuarkBlock; -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; @@ -15,11 +8,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.ChainBlock; -import net.minecraft.world.level.block.LanternBlock; -import net.minecraft.world.level.block.SimpleWaterloggedBlock; -import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -29,6 +18,12 @@ import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; +import org.violetmoon.quark.base.block.IQuarkBlock; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nonnull; public class WoodPostBlock extends QuarkBlock implements SimpleWaterloggedBlock { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/be/VariantChestBlockEntity.java b/src/main/java/org/violetmoon/quark/content/building/block/be/VariantChestBlockEntity.java index 9b606ff9f1..a2ef323ed9 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/be/VariantChestBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/be/VariantChestBlockEntity.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.content.building.block.be; -import org.violetmoon.quark.content.building.module.VariantChestsModule; - import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.ChestBlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; +import org.violetmoon.quark.content.building.module.VariantChestsModule; public class VariantChestBlockEntity extends ChestBlockEntity { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/be/VariantFurnaceBlockEntity.java b/src/main/java/org/violetmoon/quark/content/building/block/be/VariantFurnaceBlockEntity.java index faa5b580a7..5374f95213 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/be/VariantFurnaceBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/be/VariantFurnaceBlockEntity.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.content.building.block.be; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.building.module.VariantFurnacesModule; - import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; @@ -12,6 +8,9 @@ import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.content.building.module.VariantFurnacesModule; + +import javax.annotation.Nonnull; public class VariantFurnaceBlockEntity extends AbstractFurnaceBlockEntity { diff --git a/src/main/java/org/violetmoon/quark/content/building/block/be/VariantTrappedChestBlockEntity.java b/src/main/java/org/violetmoon/quark/content/building/block/be/VariantTrappedChestBlockEntity.java index 796be85e29..7628b4cd56 100644 --- a/src/main/java/org/violetmoon/quark/content/building/block/be/VariantTrappedChestBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/content/building/block/be/VariantTrappedChestBlockEntity.java @@ -4,11 +4,10 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.content.building.module.VariantChestsModule; import javax.annotation.Nonnull; -import org.violetmoon.quark.content.building.module.VariantChestsModule; - public class VariantTrappedChestBlockEntity extends VariantChestBlockEntity { public VariantTrappedChestBlockEntity(BlockPos pos, BlockState state) { diff --git a/src/main/java/org/violetmoon/quark/content/building/client/render/be/VariantChestRenderer.java b/src/main/java/org/violetmoon/quark/content/building/client/render/be/VariantChestRenderer.java index 76d748aa3b..d48cdb6829 100644 --- a/src/main/java/org/violetmoon/quark/content/building/client/render/be/VariantChestRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/building/client/render/be/VariantChestRenderer.java @@ -6,15 +6,14 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.ChestBlockEntity; import net.minecraft.world.level.block.state.properties.ChestType; - -import java.util.HashMap; -import java.util.Map; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.client.render.GenericChestBERenderer; import org.violetmoon.quark.content.building.module.VariantChestsModule.IChestTextureProvider; import org.violetmoon.zeta.client.event.load.ZPreTextureStitch; +import java.util.HashMap; +import java.util.Map; + public class VariantChestRenderer extends GenericChestBERenderer { private static final Map chestTextures = new HashMap<>(); diff --git a/src/main/java/org/violetmoon/quark/content/building/client/render/entity/GlassItemFrameRenderer.java b/src/main/java/org/violetmoon/quark/content/building/client/render/entity/GlassItemFrameRenderer.java index 3a8e3ee417..0fee571eec 100644 --- a/src/main/java/org/violetmoon/quark/content/building/client/render/entity/GlassItemFrameRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/building/client/render/entity/GlassItemFrameRenderer.java @@ -1,17 +1,8 @@ package org.violetmoon.quark.content.building.client.render.entity; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.content.building.entity.GlassItemFrame; -import org.violetmoon.quark.content.building.module.GlassItemFrameModule; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.datafixers.util.Pair; import com.mojang.math.Vector3f; - import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.ModelLayers; import net.minecraft.client.model.geom.ModelPart; @@ -35,22 +26,22 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; -import net.minecraft.world.item.BannerItem; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.MapItem; -import net.minecraft.world.item.ShieldItem; +import net.minecraft.world.item.*; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.StandingSignBlock; import net.minecraft.world.level.block.entity.BannerBlockEntity; import net.minecraft.world.level.block.entity.BannerPattern; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.saveddata.maps.MapItemSavedData; import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RenderItemInFrameEvent; import net.minecraftforge.common.MinecraftForge; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.content.building.entity.GlassItemFrame; +import org.violetmoon.quark.content.building.module.GlassItemFrameModule; + +import javax.annotation.Nonnull; +import java.util.List; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/building/client/render/entity/StoolEntityRenderer.java b/src/main/java/org/violetmoon/quark/content/building/client/render/entity/StoolEntityRenderer.java index efb65868b1..e69e583ecb 100644 --- a/src/main/java/org/violetmoon/quark/content/building/client/render/entity/StoolEntityRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/building/client/render/entity/StoolEntityRenderer.java @@ -4,11 +4,10 @@ import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.quark.content.building.entity.Stool; import javax.annotation.Nonnull; -import org.violetmoon.quark.content.building.entity.Stool; - public class StoolEntityRenderer extends EntityRenderer { public StoolEntityRenderer(EntityRendererProvider.Context context) { diff --git a/src/main/java/org/violetmoon/quark/content/building/entity/GlassItemFrame.java b/src/main/java/org/violetmoon/quark/content/building/entity/GlassItemFrame.java index 3fcba214ef..8997333b1c 100755 --- a/src/main/java/org/violetmoon/quark/content/building/entity/GlassItemFrame.java +++ b/src/main/java/org/violetmoon/quark/content/building/entity/GlassItemFrame.java @@ -27,17 +27,13 @@ import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.entity.IEntityAdditionalSpawnData; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.content.building.module.GlassItemFrameModule; import javax.annotation.Nonnull; import javax.annotation.Nullable; - -import org.violetmoon.quark.content.building.module.GlassItemFrameModule; - -import java.lang.ref.WeakReference; import java.util.UUID; public class GlassItemFrame extends ItemFrame implements IEntityAdditionalSpawnData { diff --git a/src/main/java/org/violetmoon/quark/content/building/entity/Stool.java b/src/main/java/org/violetmoon/quark/content/building/entity/Stool.java index c32e569487..30f0dd3b07 100644 --- a/src/main/java/org/violetmoon/quark/content/building/entity/Stool.java +++ b/src/main/java/org/violetmoon/quark/content/building/entity/Stool.java @@ -13,11 +13,9 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; import net.minecraftforge.network.NetworkHooks; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.content.building.block.StoolBlock; +import javax.annotation.Nonnull; import java.util.List; public class Stool extends Entity { diff --git a/src/main/java/org/violetmoon/quark/content/building/item/QuarkItemFrameItem.java b/src/main/java/org/violetmoon/quark/content/building/item/QuarkItemFrameItem.java index 10c6cab827..add89f9eeb 100644 --- a/src/main/java/org/violetmoon/quark/content/building/item/QuarkItemFrameItem.java +++ b/src/main/java/org/violetmoon/quark/content/building/item/QuarkItemFrameItem.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.building.item; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.item.QuarkItem; -import org.violetmoon.quark.base.util.TriFunction; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -19,6 +13,11 @@ import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.gameevent.GameEvent; +import org.violetmoon.quark.base.item.QuarkItem; +import org.violetmoon.quark.base.util.TriFunction; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/building/module/CelebratoryLampsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/CelebratoryLampsModule.java index 73d3b090b6..b582c4295c 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/CelebratoryLampsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/CelebratoryLampsModule.java @@ -1,5 +1,12 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -9,14 +16,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.ChatFormatting; -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; - @ZetaLoadModule(category = "building") public class CelebratoryLampsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/CompressedBlocksModule.java b/src/main/java/org/violetmoon/quark/content/building/module/CompressedBlocksModule.java index c9cd34baa3..b727adb2cb 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/CompressedBlocksModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/CompressedBlocksModule.java @@ -8,17 +8,11 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; -import net.minecraftforge.common.ToolActions; - -import java.util.List; -import java.util.function.BooleanSupplier; - import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.block.QuarkFlammableBlock; import org.violetmoon.quark.base.block.QuarkFlammablePillarBlock; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.FuelHandler; -import org.violetmoon.quark.base.handler.ToolInteractionHandler; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZLoadComplete; import org.violetmoon.zeta.event.load.ZRegister; @@ -26,6 +20,9 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.List; +import java.util.function.BooleanSupplier; + @ZetaLoadModule(category = "building") public class CompressedBlocksModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/DuskboundBlocksModule.java b/src/main/java/org/violetmoon/quark/content/building/module/DuskboundBlocksModule.java index 19d358a3a5..d589eccca9 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/DuskboundBlocksModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/DuskboundBlocksModule.java @@ -1,5 +1,8 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.handler.VariantHandler; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -7,10 +10,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; - @ZetaLoadModule(category = "building") public class DuskboundBlocksModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/FramedGlassModule.java b/src/main/java/org/violetmoon/quark/content/building/module/FramedGlassModule.java index 05f3a0eb46..f7ae26fe21 100755 --- a/src/main/java/org/violetmoon/quark/content/building/module/FramedGlassModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/FramedGlassModule.java @@ -1,5 +1,10 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.Material; import org.violetmoon.quark.base.block.QuarkGlassBlock; import org.violetmoon.quark.base.block.QuarkInheritedPaneBlock; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -7,12 +12,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.material.Material; - @ZetaLoadModule(category = "building") public class FramedGlassModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/GlassItemFrameModule.java b/src/main/java/org/violetmoon/quark/content/building/module/GlassItemFrameModule.java index 7b809102c5..2388dac456 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/GlassItemFrameModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/GlassItemFrameModule.java @@ -1,5 +1,11 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.core.Registry; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.item.Item; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.building.client.render.entity.GlassItemFrameRenderer; @@ -13,13 +19,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.core.Registry; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.item.Item; - /** * @author WireSegal * Created at 11:00 AM on 8/25/19. diff --git a/src/main/java/org/violetmoon/quark/content/building/module/GoldBarsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/GoldBarsModule.java index 49c2a2626e..d0057d05c6 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/GoldBarsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/GoldBarsModule.java @@ -1,5 +1,11 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.level.ServerLevelAccessor; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockBehaviour.Properties; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.levelgen.structure.BuiltinStructures; import org.violetmoon.quark.base.block.QuarkPaneBlock; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.StructureBlockReplacementHandler; @@ -11,13 +17,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.RenderLayerRegistry; -import net.minecraft.world.level.ServerLevelAccessor; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour.Properties; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.levelgen.structure.BuiltinStructures; - @ZetaLoadModule(category = "building") public class GoldBarsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/GrateModule.java b/src/main/java/org/violetmoon/quark/content/building/module/GrateModule.java index 48dff6d77e..077653e118 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/GrateModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/GrateModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.level.block.Block; import org.violetmoon.quark.content.building.block.GrateBlock; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZRegister; @@ -7,8 +8,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.world.level.block.Block; - /** * @author WireSegal * Created at 8:57 AM on 8/27/19. diff --git a/src/main/java/org/violetmoon/quark/content/building/module/HedgesModule.java b/src/main/java/org/violetmoon/quark/content/building/module/HedgesModule.java index b8c8f4a4dc..68624b29d8 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/HedgesModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/HedgesModule.java @@ -1,5 +1,10 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.util.VanillaWoods; import org.violetmoon.quark.base.util.VanillaWoods.Wood; @@ -16,12 +21,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; - @ZetaLoadModule(category = "building") public class HedgesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/HollowLogsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/HollowLogsModule.java index 23b0b56279..5d67372a86 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/HollowLogsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/HollowLogsModule.java @@ -1,5 +1,16 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.Direction.Axis; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.entity.Pose; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; import org.violetmoon.quark.api.ICrawlSpaceBlock; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; @@ -17,18 +28,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.Direction.Axis; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.entity.Pose; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; - @ZetaLoadModule(category = "building") public class HollowLogsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/IndustrialPaletteModule.java b/src/main/java/org/violetmoon/quark/content/building/module/IndustrialPaletteModule.java index 9065a10623..f0fe8cfc29 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/IndustrialPaletteModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/IndustrialPaletteModule.java @@ -7,9 +7,6 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; import net.minecraftforge.common.util.ForgeSoundType; - -import java.util.function.BooleanSupplier; - import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.block.QuarkPillarBlock; import org.violetmoon.quark.base.config.Config; @@ -20,6 +17,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.function.BooleanSupplier; + @ZetaLoadModule(category = "building") public class IndustrialPaletteModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/JapanesePaletteModule.java b/src/main/java/org/violetmoon/quark/content/building/module/JapanesePaletteModule.java index c385427dad..1d8c07303f 100755 --- a/src/main/java/org/violetmoon/quark/content/building/module/JapanesePaletteModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/JapanesePaletteModule.java @@ -10,8 +10,6 @@ */ package org.violetmoon.quark.content.building.module; -import java.util.function.BooleanSupplier; - import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.building.block.BambooMatBlock; @@ -23,6 +21,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.function.BooleanSupplier; + @ZetaLoadModule(category = "building") public class JapanesePaletteModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/LeafCarpetModule.java b/src/main/java/org/violetmoon/quark/content/building/module/LeafCarpetModule.java index bae3ad81e3..d277bf8522 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/LeafCarpetModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/LeafCarpetModule.java @@ -1,8 +1,8 @@ package org.violetmoon.quark.content.building.module; -import java.util.LinkedList; -import java.util.List; - +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.ComposterBlock; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.util.VanillaWoods; @@ -20,9 +20,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.ComposterBlock; +import java.util.LinkedList; +import java.util.List; @ZetaLoadModule(category = "building", antiOverlap = { "woodworks", "immersive_weathering" }) public class LeafCarpetModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/MidoriModule.java b/src/main/java/org/violetmoon/quark/content/building/module/MidoriModule.java index 8554e87dec..fde7a32687 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/MidoriModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/MidoriModule.java @@ -1,5 +1,11 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.ComposterBlock; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.material.MaterialColor; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.block.QuarkPillarBlock; import org.violetmoon.quark.base.handler.VariantHandler; @@ -10,13 +16,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.ComposterBlock; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.material.MaterialColor; - @ZetaLoadModule(category = "building") public class MidoriModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/MoreBrickTypesModule.java b/src/main/java/org/violetmoon/quark/content/building/module/MoreBrickTypesModule.java index 1740bd5531..41fe9ee9d7 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/MoreBrickTypesModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/MoreBrickTypesModule.java @@ -3,9 +3,6 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; - -import java.util.function.BooleanSupplier; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.config.Config; @@ -15,6 +12,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.function.BooleanSupplier; + @ZetaLoadModule(category = "building") public class MoreBrickTypesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/MoreMudBlocksModule.java b/src/main/java/org/violetmoon/quark/content/building/module/MoreMudBlocksModule.java index 0c438fc556..9e6e9b0a62 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/MoreMudBlocksModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/MoreMudBlocksModule.java @@ -1,5 +1,9 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockBehaviour.Properties; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.block.QuarkPillarBlock; import org.violetmoon.quark.content.building.block.MudBrickLatticeBlock; @@ -8,11 +12,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.BlockBehaviour.Properties; - @ZetaLoadModule(category = "building") public class MoreMudBlocksModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/MorePottedPlantsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/MorePottedPlantsModule.java index 3548f51b92..51fa8ab06b 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/MorePottedPlantsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/MorePottedPlantsModule.java @@ -8,11 +8,6 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.FlowerPotBlock; import net.minecraft.world.level.block.state.BlockState; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.violetmoon.quark.base.handler.VariantHandler; import org.violetmoon.zeta.client.event.load.ZClientSetup; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -21,6 +16,10 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + @ZetaLoadModule(category = "building") public class MorePottedPlantsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/MoreStoneVariantsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/MoreStoneVariantsModule.java index 7ded8ba947..fd2f42b979 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/MoreStoneVariantsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/MoreStoneVariantsModule.java @@ -6,9 +6,6 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; - -import java.util.function.BooleanSupplier; - import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.block.QuarkPillarBlock; import org.violetmoon.quark.base.config.Config; @@ -24,6 +21,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.function.BooleanSupplier; + @ZetaLoadModule(category = "building") public class MoreStoneVariantsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/NetherBrickFenceGateModule.java b/src/main/java/org/violetmoon/quark/content/building/module/NetherBrickFenceGateModule.java index 20f67228ad..1f65374bb5 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/NetherBrickFenceGateModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/NetherBrickFenceGateModule.java @@ -1,16 +1,15 @@ package org.violetmoon.quark.content.building.module; -import org.violetmoon.quark.base.block.QuarkFenceGateBlock; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; +import org.violetmoon.quark.base.block.QuarkFenceGateBlock; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java index d6093a7e14..613796a5d7 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java @@ -1,5 +1,9 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.util.CorundumColor; @@ -12,11 +16,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.block.Block; - @ZetaLoadModule(category = "building") public class RainbowLampsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/RawMetalBricksModule.java b/src/main/java/org/violetmoon/quark/content/building/module/RawMetalBricksModule.java index 096882b744..5e0ec6cb3e 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/RawMetalBricksModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/RawMetalBricksModule.java @@ -1,5 +1,9 @@ package org.violetmoon.quark.content.building.module; +import com.google.common.collect.ImmutableSet; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockBehaviour.Properties; import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.handler.VariantHandler; @@ -8,11 +12,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import com.google.common.collect.ImmutableSet; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour.Properties; - @ZetaLoadModule(category = "building") public class RawMetalBricksModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/RopeModule.java b/src/main/java/org/violetmoon/quark/content/building/module/RopeModule.java index fd2d94b3d7..a95d3c25bf 100755 --- a/src/main/java/org/violetmoon/quark/content/building/module/RopeModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/RopeModule.java @@ -14,9 +14,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.building.block.RopeBlock; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -26,6 +23,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import javax.annotation.Nonnull; + @ZetaLoadModule(category = "building") public class RopeModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/ShearVinesModule.java b/src/main/java/org/violetmoon/quark/content/building/module/ShearVinesModule.java index 80cb47cbe8..9d5bb043f0 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/ShearVinesModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/ShearVinesModule.java @@ -1,20 +1,5 @@ package org.violetmoon.quark.content.building.module; -import java.util.Map; - -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.content.building.block.CutVineBlock; -import org.violetmoon.zeta.client.AlikeColorHandler; -import org.violetmoon.zeta.client.event.load.ZAddBlockColorHandlers; -import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; @@ -30,6 +15,20 @@ import net.minecraft.world.level.block.VineBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.content.building.block.CutVineBlock; +import org.violetmoon.zeta.client.AlikeColorHandler; +import org.violetmoon.zeta.client.event.load.ZAddBlockColorHandlers; +import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; + +import java.util.Map; @ZetaLoadModule(category = "building") public class ShearVinesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/ShinglesModule.java b/src/main/java/org/violetmoon/quark/content/building/module/ShinglesModule.java index eed0322b61..a16cca4995 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/ShinglesModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/ShinglesModule.java @@ -1,5 +1,8 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.handler.VariantHandler; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -7,10 +10,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; - @ZetaLoadModule(category = "building") public class ShinglesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/SoulSandstoneModule.java b/src/main/java/org/violetmoon/quark/content/building/module/SoulSandstoneModule.java index 2d5cfbb3f4..f0f35d83cb 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/SoulSandstoneModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/SoulSandstoneModule.java @@ -1,5 +1,9 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.material.MaterialColor; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.handler.VariantHandler; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -7,11 +11,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.material.MaterialColor; - @ZetaLoadModule(category = "building") public class SoulSandstoneModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/StoolsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/StoolsModule.java index 3a6787d3ac..3c432c8e32 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/StoolsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/StoolsModule.java @@ -1,5 +1,17 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.core.Direction; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.state.BlockState; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.building.block.StoolBlock; import org.violetmoon.quark.content.building.client.render.entity.StoolEntityRenderer; @@ -14,19 +26,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.core.Direction; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.state.BlockState; - @ZetaLoadModule(category = "building") public class StoolsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/SturdyStoneModule.java b/src/main/java/org/violetmoon/quark/content/building/module/SturdyStoneModule.java index 68398de34d..5503b65ca1 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/SturdyStoneModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/SturdyStoneModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.level.block.Block; import org.violetmoon.quark.content.building.block.SturdyStoneBlock; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZRegister; @@ -7,8 +8,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.world.level.block.Block; - @ZetaLoadModule(category = "building") public class SturdyStoneModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/ThatchModule.java b/src/main/java/org/violetmoon/quark/content/building/module/ThatchModule.java index 778d99d2c9..ef46c478a4 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/ThatchModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/ThatchModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.level.block.ComposterBlock; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.VariantHandler; import org.violetmoon.quark.content.building.block.ThatchBlock; @@ -9,8 +10,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.level.block.ComposterBlock; - @ZetaLoadModule(category = "building", antiOverlap = {"goated", "environmental"}) public class ThatchModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VariantBookshelvesModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VariantBookshelvesModule.java index 2a1166b2eb..69c2bd43f9 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/VariantBookshelvesModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/VariantBookshelvesModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.level.block.Blocks; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.ItemOverrideHandler; import org.violetmoon.quark.base.util.VanillaWoods; @@ -11,8 +12,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.level.block.Blocks; - @ZetaLoadModule(category = "building", antiOverlap = { "woodworks" }) public class VariantBookshelvesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VariantChestsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VariantChestsModule.java index 4bcd3a096b..fe582bd0f8 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/VariantChestsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/VariantChestsModule.java @@ -25,9 +25,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.structure.Structure; import net.minecraftforge.common.Tags; - -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.StructureBlockReplacementHandler; @@ -44,7 +41,6 @@ import org.violetmoon.quark.mixin.accessor.AccessorAbstractChestedHorse; import org.violetmoon.zeta.client.event.load.ZClientSetup; import org.violetmoon.zeta.client.event.load.ZPreTextureStitch; -import org.violetmoon.zeta.event.*; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.load.ZConfigChanged; @@ -57,6 +53,7 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nullable; import java.util.*; import java.util.function.BooleanSupplier; import java.util.function.Consumer; diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VariantFurnacesModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VariantFurnacesModule.java index a522512b46..7353966558 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/VariantFurnacesModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/VariantFurnacesModule.java @@ -7,9 +7,6 @@ import net.minecraft.world.level.block.state.BlockBehaviour.Properties; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; - -import java.util.function.ToIntFunction; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.building.block.SoulFurnaceBlock; import org.violetmoon.quark.content.building.block.VariantFurnaceBlock; @@ -20,6 +17,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.function.ToIntFunction; + @ZetaLoadModule(category = "building") public class VariantFurnacesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VariantLaddersModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VariantLaddersModule.java index bd51f1fbb3..de2c5d8806 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/VariantLaddersModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/VariantLaddersModule.java @@ -7,10 +7,6 @@ import net.minecraft.world.level.block.LadderBlock; import net.minecraft.world.level.block.TrapDoorBlock; import net.minecraft.world.level.block.state.BlockState; - -import java.util.LinkedList; -import java.util.List; - import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.FuelHandler; import org.violetmoon.quark.base.handler.ItemOverrideHandler; @@ -24,6 +20,9 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.LinkedList; +import java.util.List; + @ZetaLoadModule(category = "building", antiOverlap = { "woodworks" }) public class VariantLaddersModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VerticalPlanksModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VerticalPlanksModule.java index d21a1cd527..45fab2f201 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/VerticalPlanksModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/VerticalPlanksModule.java @@ -1,5 +1,7 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Block; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.util.VanillaWoods; import org.violetmoon.quark.base.util.VanillaWoods.Wood; @@ -8,9 +10,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Block; - @ZetaLoadModule(category = "building", antiOverlap = { "woodworks" }) public class VerticalPlanksModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java index d5d8644abb..08e68dd8e9 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java @@ -1,17 +1,5 @@ package org.violetmoon.quark.content.building.module; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.ToolInteractionHandler; -import org.violetmoon.quark.base.util.VanillaWoods; -import org.violetmoon.quark.base.util.VanillaWoods.Wood; -import org.violetmoon.quark.content.building.block.WoodPostBlock; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZCommonSetup; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; @@ -23,6 +11,17 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraftforge.common.ToolActions; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.ToolInteractionHandler; +import org.violetmoon.quark.base.util.VanillaWoods; +import org.violetmoon.quark.base.util.VanillaWoods.Wood; +import org.violetmoon.quark.content.building.block.WoodPostBlock; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZCommonSetup; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; @ZetaLoadModule(category = "building") public class WoodenPostsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/building/recipe/MixedExclusionRecipe.java b/src/main/java/org/violetmoon/quark/content/building/recipe/MixedExclusionRecipe.java index a1a07a583c..d6cca9436e 100644 --- a/src/main/java/org/violetmoon/quark/content/building/recipe/MixedExclusionRecipe.java +++ b/src/main/java/org/violetmoon/quark/content/building/recipe/MixedExclusionRecipe.java @@ -1,9 +1,6 @@ package org.violetmoon.quark.content.building.recipe; -import javax.annotation.Nonnull; - import com.google.gson.JsonObject; - import net.minecraft.core.NonNullList; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -19,6 +16,8 @@ import net.minecraft.world.level.Level; import net.minecraftforge.common.crafting.IShapedRecipe; +import javax.annotation.Nonnull; + public class MixedExclusionRecipe implements CraftingRecipe, IShapedRecipe { public static final Serializer SERIALIZER = new Serializer(); diff --git a/src/main/java/org/violetmoon/quark/content/client/hax/PseudoAccessorItemStack.java b/src/main/java/org/violetmoon/quark/content/client/hax/PseudoAccessorItemStack.java index 7b0c310977..f07f4774c6 100644 --- a/src/main/java/org/violetmoon/quark/content/client/hax/PseudoAccessorItemStack.java +++ b/src/main/java/org/violetmoon/quark/content/client/hax/PseudoAccessorItemStack.java @@ -4,12 +4,11 @@ import com.mojang.datafixers.util.Pair; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import org.violetmoon.quark.content.client.resources.AttributeSlot; import java.util.List; import java.util.Map; -import org.violetmoon.quark.content.client.resources.AttributeSlot; - /** * This is extremely jank. Please do not use this as an example for anything unless you ABSOLUTELY know what you're doing. * diff --git a/src/main/java/org/violetmoon/quark/content/client/module/AutoWalkKeybindModule.java b/src/main/java/org/violetmoon/quark/content/client/module/AutoWalkKeybindModule.java index d4433113c2..cb2e7e612a 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/AutoWalkKeybindModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/AutoWalkKeybindModule.java @@ -1,5 +1,13 @@ package org.violetmoon.quark.content.client.module; +import com.mojang.blaze3d.platform.Window; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.OptionInstance; +import net.minecraft.client.player.Input; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.client.resources.language.I18n; +import net.minecraft.world.entity.player.Player; import org.violetmoon.quark.base.QuarkClient; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.client.event.load.ZKeyMapping; @@ -11,16 +19,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import com.mojang.blaze3d.platform.Window; - -import net.minecraft.client.KeyMapping; -import net.minecraft.client.Minecraft; -import net.minecraft.client.OptionInstance; -import net.minecraft.client.player.Input; -import net.minecraft.client.player.LocalPlayer; -import net.minecraft.client.resources.language.I18n; -import net.minecraft.world.entity.player.Player; - @ZetaLoadModule(category = "client") public class AutoWalkKeybindModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/client/module/BucketsShowInhabitantsModule.java b/src/main/java/org/violetmoon/quark/content/client/module/BucketsShowInhabitantsModule.java index 4637f1d621..0769dc1f94 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/BucketsShowInhabitantsModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/BucketsShowInhabitantsModule.java @@ -13,10 +13,6 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.QuarkClient; import org.violetmoon.quark.base.config.Config; @@ -31,6 +27,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.ItemNBTHelper; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.UUID; import java.util.function.BooleanSupplier; import java.util.function.IntUnaryOperator; diff --git a/src/main/java/org/violetmoon/quark/content/client/module/ChestSearchingModule.java b/src/main/java/org/violetmoon/quark/content/client/module/ChestSearchingModule.java index 1649b5f98b..5df725af4e 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/ChestSearchingModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/ChestSearchingModule.java @@ -39,7 +39,6 @@ import org.violetmoon.quark.base.handler.MiscUtil; import org.violetmoon.quark.base.handler.SimilarBlockTypeHandler; import org.violetmoon.quark.content.management.client.screen.widgets.MiniInventoryButton; -import org.violetmoon.zeta.client.event.*; import org.violetmoon.zeta.client.event.load.ZClientSetup; import org.violetmoon.zeta.client.event.play.ZRenderContainerScreen; import org.violetmoon.zeta.client.event.play.ZScreen; diff --git a/src/main/java/org/violetmoon/quark/content/client/module/ElytraIndicatorModule.java b/src/main/java/org/violetmoon/quark/content/client/module/ElytraIndicatorModule.java index 69a55c5015..0c707c6058 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/ElytraIndicatorModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/ElytraIndicatorModule.java @@ -1,20 +1,18 @@ package org.violetmoon.quark.content.client.module; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; @ZetaLoadModule(category = "client") public class ElytraIndicatorModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/client/module/GreenerGrassModule.java b/src/main/java/org/violetmoon/quark/content/client/module/GreenerGrassModule.java index fb24f92e79..94c5b2a047 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/GreenerGrassModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/GreenerGrassModule.java @@ -1,18 +1,7 @@ package org.violetmoon.quark.content.client.module; -import java.util.List; - -import org.violetmoon.quark.base.QuarkClient; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.config.type.inputtable.ConvulsionMatrixConfig; -import org.violetmoon.zeta.client.event.play.ZFirstClientTick; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import com.google.common.base.Supplier; import com.google.common.collect.Lists; - import net.minecraft.client.Minecraft; import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.block.BlockColors; @@ -20,6 +9,15 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import org.violetmoon.quark.base.QuarkClient; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.config.type.inputtable.ConvulsionMatrixConfig; +import org.violetmoon.zeta.client.event.play.ZFirstClientTick; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.List; @ZetaLoadModule(category = "client") public class GreenerGrassModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/client/module/ImprovedTooltipsModule.java b/src/main/java/org/violetmoon/quark/content/client/module/ImprovedTooltipsModule.java index 3e25df926e..aa78ffdf93 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/ImprovedTooltipsModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/ImprovedTooltipsModule.java @@ -1,16 +1,11 @@ package org.violetmoon.quark.content.client.module; -import java.util.List; - +import com.google.common.collect.Lists; +import net.minecraft.world.item.ItemStack; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.client.resources.AttributeTooltipManager; -import org.violetmoon.quark.content.client.tooltip.AttributeTooltips; -import org.violetmoon.quark.content.client.tooltip.EnchantedBookTooltips; -import org.violetmoon.quark.content.client.tooltip.FoodTooltips; -import org.violetmoon.quark.content.client.tooltip.FuelTooltips; -import org.violetmoon.quark.content.client.tooltip.MapTooltips; -import org.violetmoon.quark.content.client.tooltip.ShulkerBoxTooltips; +import org.violetmoon.quark.content.client.tooltip.*; import org.violetmoon.zeta.client.event.load.ZRegisterReloadListeners; import org.violetmoon.zeta.client.event.load.ZTooltipComponents; import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; @@ -21,9 +16,7 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.ItemNBTHelper; -import com.google.common.collect.Lists; - -import net.minecraft.world.item.ItemStack; +import java.util.List; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/client/module/LongRangePickBlockModule.java b/src/main/java/org/violetmoon/quark/content/client/module/LongRangePickBlockModule.java index e09b029910..525cae9229 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/LongRangePickBlockModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/LongRangePickBlockModule.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.content.client.module; -import org.violetmoon.quark.base.handler.RayTraceHandler; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.client.Minecraft; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.ClipContext.Block; @@ -13,6 +9,9 @@ import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult.Type; +import org.violetmoon.quark.base.handler.RayTraceHandler; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; @ZetaLoadModule(category = "client") public class LongRangePickBlockModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/client/module/SoulCandlesModule.java b/src/main/java/org/violetmoon/quark/content/client/module/SoulCandlesModule.java index e72726f889..33f34f3749 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/SoulCandlesModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/SoulCandlesModule.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.client.module; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZConfigChanged; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; @@ -15,6 +9,11 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZConfigChanged; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; @ZetaLoadModule(category = "client") // Not using a client module replacement b/c everything here happens to be side-safe public class SoulCandlesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/client/module/UsageTickerModule.java b/src/main/java/org/violetmoon/quark/content/client/module/UsageTickerModule.java index 4cdaa78906..4e55388ba6 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/UsageTickerModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/UsageTickerModule.java @@ -11,11 +11,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ProjectileWeaponItem; import net.minecraft.world.item.enchantment.Enchantments; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Predicate; - import org.violetmoon.quark.api.IUsageTickerOverride; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; @@ -27,6 +22,10 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Predicate; + @ZetaLoadModule(category = "client") public class UsageTickerModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/client/module/UsesForCursesModule.java b/src/main/java/org/violetmoon/quark/content/client/module/UsesForCursesModule.java index 7f2b1944b6..0e3e4c8179 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/UsesForCursesModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/UsesForCursesModule.java @@ -1,17 +1,5 @@ package org.violetmoon.quark.content.client.module; -import java.util.Arrays; -import java.util.List; - -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.content.tweaks.client.layer.ArmorStandFakePlayerLayer; -import org.violetmoon.zeta.client.event.load.ZAddModelLayers; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZConfigChanged; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.client.renderer.entity.ArmorStandRenderer; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; @@ -21,6 +9,17 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.block.Blocks; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.content.tweaks.client.layer.ArmorStandFakePlayerLayer; +import org.violetmoon.zeta.client.event.load.ZAddModelLayers; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZConfigChanged; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; + +import java.util.Arrays; +import java.util.List; @ZetaLoadModule(category = "client") public class UsesForCursesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/client/module/VariantAnimalTexturesModule.java b/src/main/java/org/violetmoon/quark/content/client/module/VariantAnimalTexturesModule.java index 6ca52042db..f4e4be97f3 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/VariantAnimalTexturesModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/VariantAnimalTexturesModule.java @@ -12,9 +12,6 @@ import net.minecraft.world.entity.animal.horse.Llama; import net.minecraft.world.entity.monster.Slime; import net.minecraft.world.level.Level; - -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.client.event.load.ZClientSetup; @@ -25,6 +22,7 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nullable; import java.util.*; import java.util.function.Supplier; diff --git a/src/main/java/org/violetmoon/quark/content/client/module/WoolShutsUpMinecartsModule.java b/src/main/java/org/violetmoon/quark/content/client/module/WoolShutsUpMinecartsModule.java index d7fcad77ee..df0cd8415e 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/WoolShutsUpMinecartsModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/WoolShutsUpMinecartsModule.java @@ -1,16 +1,15 @@ package org.violetmoon.quark.content.client.module; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZConfigChanged; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.vehicle.AbstractMinecart; import net.minecraft.world.item.Item; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZConfigChanged; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; @ZetaLoadModule(category = "client") public class WoolShutsUpMinecartsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/client/resources/AttributeIconEntry.java b/src/main/java/org/violetmoon/quark/content/client/resources/AttributeIconEntry.java index 926c1b7586..3562a4f902 100644 --- a/src/main/java/org/violetmoon/quark/content/client/resources/AttributeIconEntry.java +++ b/src/main/java/org/violetmoon/quark/content/client/resources/AttributeIconEntry.java @@ -1,24 +1,16 @@ package org.violetmoon.quark.content.client.resources; +import com.google.gson.*; +import net.minecraft.ChatFormatting; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.GsonHelper; + import java.lang.reflect.Type; import java.util.Comparator; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import com.google.gson.JsonSyntaxException; - -import net.minecraft.ChatFormatting; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.GsonHelper; - public record AttributeIconEntry( Map displayTypes, ResourceLocation texture, diff --git a/src/main/java/org/violetmoon/quark/content/client/resources/AttributeTooltipManager.java b/src/main/java/org/violetmoon/quark/content/client/resources/AttributeTooltipManager.java index 809be1f4b9..20989c69b3 100644 --- a/src/main/java/org/violetmoon/quark/content/client/resources/AttributeTooltipManager.java +++ b/src/main/java/org/violetmoon/quark/content/client/resources/AttributeTooltipManager.java @@ -1,29 +1,26 @@ package org.violetmoon.quark.content.client.resources; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.Nonnull; - -import org.apache.logging.log4j.Logger; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.content.client.tooltip.AttributeTooltips; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; - import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.Resource; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.SimplePreparableReloadListener; import net.minecraft.util.GsonHelper; import net.minecraft.util.profiling.ProfilerFiller; +import org.apache.logging.log4j.Logger; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.content.client.tooltip.AttributeTooltips; + +import javax.annotation.Nonnull; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; public class AttributeTooltipManager extends SimplePreparableReloadListener> { private static final Gson GSON = new GsonBuilder() diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java index 572d7a2fff..12407a1456 100644 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java @@ -1,27 +1,5 @@ package org.violetmoon.quark.content.client.tooltip; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.QuarkClient; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.content.client.hax.PseudoAccessorItemStack; -import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; -import org.violetmoon.quark.content.client.resources.AttributeDisplayType; -import org.violetmoon.quark.content.client.resources.AttributeIconEntry; -import org.violetmoon.quark.content.client.resources.AttributeSlot; -import org.violetmoon.quark.content.client.resources.AttributeIconEntry.CompareType; -import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; -import org.violetmoon.zeta.util.ItemNBTHelper; - import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; @@ -46,12 +24,7 @@ import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.MobType; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeInstance; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.AttributeSupplier; -import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.entity.ai.attributes.DefaultAttributes; +import net.minecraft.world.entity.ai.attributes.*; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemStack; @@ -60,6 +33,21 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.QuarkClient; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.content.client.hax.PseudoAccessorItemStack; +import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; +import org.violetmoon.quark.content.client.resources.AttributeDisplayType; +import org.violetmoon.quark.content.client.resources.AttributeIconEntry; +import org.violetmoon.quark.content.client.resources.AttributeIconEntry.CompareType; +import org.violetmoon.quark.content.client.resources.AttributeSlot; +import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.*; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/EnchantedBookTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/EnchantedBookTooltips.java index a3b170a423..e5a9651f7f 100755 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/EnchantedBookTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/EnchantedBookTooltips.java @@ -1,19 +1,5 @@ package org.violetmoon.quark.content.client.tooltip; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.item.QuarkItem; -import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; -import org.violetmoon.quark.content.tools.item.AncientTomeItem; -import org.violetmoon.quark.content.tools.module.AncientTomesModule; -import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; -import org.violetmoon.zeta.util.ItemNBTHelper; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.mojang.blaze3d.systems.RenderSystem; @@ -34,6 +20,18 @@ import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.EnchantmentInstance; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.item.QuarkItem; +import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; +import org.violetmoon.quark.content.tools.item.AncientTomeItem; +import org.violetmoon.quark.content.tools.module.AncientTomesModule; +import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; public class EnchantedBookTooltips { diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/FoodTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/FoodTooltips.java index 60a5b9acaa..5a73088659 100755 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/FoodTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/FoodTooltips.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.client.tooltip; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; -import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.datafixers.util.Either; @@ -25,6 +18,11 @@ import net.minecraft.world.food.FoodProperties; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemStack; +import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; +import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; + +import javax.annotation.Nonnull; +import java.util.List; public class FoodTooltips { diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/FuelTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/FuelTooltips.java index 23bc548ebe..a82d5554d4 100644 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/FuelTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/FuelTooltips.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.client.tooltip; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; -import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.datafixers.util.Either; @@ -21,6 +14,12 @@ import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.RecipeType; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; +import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; + +import javax.annotation.Nonnull; public class FuelTooltips { diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/MapTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/MapTooltips.java index ec5de22c69..ab67c3b912 100755 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/MapTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/MapTooltips.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.client.tooltip; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; -import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.PoseStack; @@ -27,6 +20,11 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.MapItem; import net.minecraft.world.level.saveddata.maps.MapItemSavedData; +import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; +import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; + +import javax.annotation.Nonnull; +import java.util.List; public class MapTooltips { diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/ShulkerBoxTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/ShulkerBoxTooltips.java index 940f4f5d75..497d58cdef 100755 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/ShulkerBoxTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/ShulkerBoxTooltips.java @@ -1,17 +1,5 @@ package org.violetmoon.quark.content.client.tooltip; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.SimilarBlockTypeHandler; -import org.violetmoon.quark.content.client.module.ChestSearchingModule; -import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; -import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; -import org.violetmoon.zeta.util.ItemNBTHelper; - import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; @@ -38,6 +26,16 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.SimilarBlockTypeHandler; +import org.violetmoon.quark.content.client.module.ChestSearchingModule; +import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; +import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; public class ShulkerBoxTooltips { diff --git a/src/main/java/org/violetmoon/quark/content/experimental/client/screen/VariantSelectorScreen.java b/src/main/java/org/violetmoon/quark/content/experimental/client/screen/VariantSelectorScreen.java index 65fef65b66..70eb915b0c 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/client/screen/VariantSelectorScreen.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/client/screen/VariantSelectorScreen.java @@ -19,21 +19,22 @@ import org.lwjgl.opengl.GL11; import org.violetmoon.quark.content.experimental.module.VariantSelectorModule; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; public class VariantSelectorScreen extends Screen { - float timeIn = 0; - int slotSelected = -1; + private float timeIn = 0; + private int slotSelected = -1; - final Minecraft mc; - final ItemStack stack; - final KeyMapping key; - final String currentVariant; - final List variants; + private final Minecraft mc; + private final ItemStack stack; + private final KeyMapping key; + private final String currentVariant; + private final List variants; - final List drawStacks = new ArrayList<>(); + private final List drawStacks = new ArrayList<>(); public VariantSelectorScreen(ItemStack stack, KeyMapping key, String currentVariant, List variants) { super(Component.empty()); @@ -45,7 +46,7 @@ public VariantSelectorScreen(ItemStack stack, KeyMapping key, String currentVari } @Override - public void render(PoseStack ms, int mx, int my, float delta) { + public void render(@Nonnull PoseStack ms, int mx, int my, float delta) { super.render(ms, mx, my, delta); timeIn += delta; @@ -60,7 +61,7 @@ public void render(PoseStack ms, int mx, int my, float delta) { // ensure the boring one is always at the bottom float pad = - ((float) Math.PI / segments) + ((float) Math.PI / 2); double angle = mouseAngle(x, y, mx, my); - double dist = (x - mx) * (x - mx) + (y - my) * (y - my); + double dist = (x - mx) * (x - mx) + (y - my) * (y - my); // loop angle around to ensure the last bit is accessible if(angle < pad) @@ -99,18 +100,25 @@ public void render(PoseStack ms, int mx, int my, float delta) { if(mouseInSector || rightVariant) radius *= 1.1f; + if (!variantExists) + radius *= 0.9f; + int gs = 0x39; if(seg % 2 == 0) gs += 0x29; int r = gs; - int g = gs ; + int g = gs; int b = gs; - int a = 0x33; + int a = 0x44; if(variantExists) { g += 0x22; a = 0x99; + } else { + r /= 4; + g /= 4; + b /= 4; } if(seg == 0) @@ -120,7 +128,7 @@ public void render(PoseStack ms, int mx, int my, float delta) { slotSelected = seg; r = 0x00; g = b = 0xAA; - } + } else if(rightVariant) { r = b = 0x00; g = 0xAA; @@ -149,12 +157,11 @@ else if(rightVariant) { RenderSystem.enableTexture(); RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); - + for(DrawStack ds : drawStacks) { - if(ds.stack().isEmpty()) - mc.font.draw(ms, "?", ds.x() + 6, ds.y() + 3, 0x99FFFFFF); - else + if (!ds.stack().isEmpty()) mc.getItemRenderer().renderGuiItem(ds.stack(), ds.x(), ds.y()); + } RenderSystem.disableBlend(); } @@ -164,10 +171,10 @@ public void tick() { super.tick(); if (!isKeyDown(key)) { mc.setScreen(null); - + if(slotSelected == -1 && timeIn < 10) slotSelected = 0; - + if(slotSelected != -1) { String variant = slotSelected == 0 ? "" : variants.get(slotSelected - 1); VariantSelectorModule.Client.setClientVariant(variant, true); diff --git a/src/main/java/org/violetmoon/quark/content/experimental/client/tooltip/VariantsComponent.java b/src/main/java/org/violetmoon/quark/content/experimental/client/tooltip/VariantsComponent.java index 117416802a..2c71bb4541 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/client/tooltip/VariantsComponent.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/client/tooltip/VariantsComponent.java @@ -1,13 +1,6 @@ package org.violetmoon.quark.content.experimental.client.tooltip; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.violetmoon.quark.content.experimental.module.VariantSelectorModule; - import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.gui.Font; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.client.renderer.entity.ItemRenderer; @@ -18,6 +11,11 @@ import net.minecraft.world.level.block.Block; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.content.experimental.module.VariantSelectorModule; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; @OnlyIn(Dist.CLIENT) public class VariantsComponent implements ClientTooltipComponent, TooltipComponent { diff --git a/src/main/java/org/violetmoon/quark/content/experimental/config/BlockSuffixConfig.java b/src/main/java/org/violetmoon/quark/content/experimental/config/BlockSuffixConfig.java deleted file mode 100644 index c0c904d17e..0000000000 --- a/src/main/java/org/violetmoon/quark/content/experimental/config/BlockSuffixConfig.java +++ /dev/null @@ -1,266 +0,0 @@ -package org.violetmoon.quark.content.experimental.config; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.config.ConfigFlagManager; -import org.violetmoon.quark.base.config.type.IConfigType; -import org.violetmoon.zeta.module.ZetaModule; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; - -public class BlockSuffixConfig implements IConfigType { - - private static final VariantMap EMPTY_VARIANT_MAP = new VariantMap(new HashMap<>()); - - @Config(description = "The list of all variant types available for players to use. Values are treated as suffixes to block IDs for scanning.\n" - + "Prefix any variant type with ! to make it show up for Manual Variants but not be automatically scanned for. (e.g. '!polish')") - private List variantTypes; - - @Config(description = "By default, only a mod's namespace is scanned for variants for its items (e.g. if coolmod adds coolmod:fun_block, it'll search only for coolmod:fun_block_stairs).\n" - + " Mods in this list are also scanned for variants if none are found in itself (e.g. if quark is in the list and coolmod:fun_block_stairs doesn't exist, it'll try to look for quark:fun_block_stairs next)") - private List testedMods; - - @Config - private boolean printVariantMapToLog = false; - - @Config(description = "Format is 'alias=original' in each value (e.g. 'wall=fence' means that a failed search for, minecraft:cobblestone_fence will try cobblestone_wall next)") - private List aliases; - - @Config(description = "Ends of block IDs to try and remove when looking for variants. (e.g. minecraft:oak_planks goes into minecraft:oak_stairs, so we have to include '_planks' in this list for it to find them or else it'll only look for minecraft:oak_planks_stairs)") - private List stripCandidates = Arrays.asList("_planks", "_wool", "s"); - - @Config(description = "Add manual variant overrides here, the format is 'type,block,output' (e.g. polish,minecraft:stone_bricks,minecraft:chiseled_stone_bricks). The type must be listed in Variant Types") - private List manualVariants = new ArrayList<>(); - - @Config - private List blacklist = new ArrayList<>(); - - private Map blockVariants = new HashMap<>(); - private Map originals = new HashMap<>(); - private Multimap aliasMap = HashMultimap.create(); - private Multimap manualVariantMap = HashMultimap.create(); - - private List visibleVariants = new ArrayList<>(); - private List sortedSuffixes; - - public BlockSuffixConfig(List variantTypes, List testedMods, List aliases) { - this.variantTypes = variantTypes; - this.testedMods = testedMods; - this.aliases = aliases; - } - - @Override - public void onReload(ZetaModule module, ConfigFlagManager flagManager) { - blockVariants.clear(); - visibleVariants.clear(); - originals.clear(); - aliasMap.clear(); - manualVariantMap.clear(); - - if(module != null && !module.enabled) - return; - - for(String s : variantTypes) - visibleVariants.add(s.replaceAll("!", "")); - - sortedSuffixes = new ArrayList<>(visibleVariants); - sortedSuffixes.sort((s1, s2) -> { // sort by amount of _ - int ct1 = s1.replaceAll("[^_]", "").length(); - int ct2 = s2.replaceAll("[^_]", "").length(); - - return ct2 - ct1; - }); - - for(String s : aliases) { - String[] toks = s.split("="); - aliasMap.put(toks[1], toks[0]); - } - - for(String s : manualVariants) { - String[] toks = s.split(","); - - Block block = Registry.BLOCK.get(new ResourceLocation(toks[1])); - Block out = Registry.BLOCK.get(new ResourceLocation(toks[2])); - manualVariantMap.put(block, new ManualVariant(toks[0], out)); - } - - // Map all variants - Registry.BLOCK.forEach(this::getVariants); - - if(printVariantMapToLog) - logVariantMap(); - } - - public String getVariantForBlock(Block block) { - String name = Registry.BLOCK.getKey(block).getPath(); - - for(String suffix : sortedSuffixes) { - if(name.endsWith(String.format("_%s", suffix))) - return suffix; - - if(aliasMap.containsKey(suffix)) - for(String alias : aliasMap.get(suffix)) - if(name.endsWith(String.format("_%s", alias))) - return suffix; - } - - return null; - } - - public Block getBlockForTarget(Block block, Block target) { - return getBlockForVariant(block, getVariantForBlock(target)); - } - - public Block getBlockForVariant(Block block, String variant) { - blockVariants.clear(); - if(variant == null || !sortedSuffixes.contains(variant)) - return block; - - VariantMap map = getVariants(block); - Block ret = map.variants.get(variant); - if(ret != null) - return ret; - - return block; - } - - public Collection getAllVariants(Block block) { - Map map = getVariants(block).variants; - List blocks = new ArrayList<>(); - for(String s : variantTypes) { - if(s.startsWith("!")) - s = s.substring(1); - - if(map.containsKey(s)) - blocks.add(map.get(s)); - } - - return blocks; - } - - public Block getOriginalBlock(Block block) { - return originals.containsKey(block) ? originals.get(block) : block; - } - - public boolean isVariant(Block block) { - return blockVariants.containsKey(block) && !blockVariants.get(block).isEmpty(); - } - - private VariantMap getVariants(Block block) { - if(blockVariants.containsKey(block)) - return blockVariants.get(block); - - Map newVariants = new HashMap<>(); - - if(!isBlacklisted(block)) - for(String s : sortedSuffixes) { - if(!variantTypes.contains(s)) - continue; // this means its marked with ! so it won't be searched - - Block suffixed = getSuffixedBlock(block, s); - if(suffixed != null && !isBlacklisted(block)) { - newVariants.put(s, suffixed); - originals.put(suffixed, block); - } - } - - if(manualVariantMap.containsKey(block)) - for(ManualVariant mv : manualVariantMap.get(block)) { - newVariants.put(mv.type, mv.out); - originals.put(mv.out, block); - } - - if(newVariants.isEmpty()) - blockVariants.put(block, EMPTY_VARIANT_MAP); - else blockVariants.put(block, new VariantMap(newVariants)); - - return getVariants(block); - } - - private Block getSuffixedBlock(Block ogBlock, String suffix) { - ResourceLocation resloc = Registry.BLOCK.getKey(ogBlock); - String namespace = resloc.getNamespace(); - String name = resloc.getPath(); - - Block ret = getSuffixedBlock(namespace, name, suffix); - if(ret != null) - return ret; - - for(String mod : testedMods) { - ret = getSuffixedBlock(mod, name, suffix); - if(ret != null) - return ret; - } - - return null; - } - - private Block getSuffixedBlock(String namespace, String name, String suffix) { - for(String strip : stripCandidates) - if(name.endsWith(strip)) { - String stripped = name.substring(0, name.length() - strip.length()); - Block strippedAttempt = getSuffixedBlock(namespace, stripped, suffix); - if(strippedAttempt != null) - return strippedAttempt; - } - - String targetStr = String.format("%s:%s_%s", namespace, name, suffix); - ResourceLocation target = new ResourceLocation(targetStr); - Block ret = Registry.BLOCK.get(target); - - if(ret == Blocks.AIR) { - if(aliasMap.containsKey(suffix)) - for(String alias : aliasMap.get(suffix)) { - Block aliasAttempt = getSuffixedBlock(namespace, name, alias); - if(aliasAttempt != null) - return aliasAttempt; - } - - return null; - } - - return ret; - } - - private boolean isBlacklisted(Block block) { - return !blacklist.isEmpty() && blacklist.contains(Registry.BLOCK.getKey(block).toString()); - } - - public boolean isKnownVariant(String variant) { - return visibleVariants.contains(variant); - } - - public List getVisibleVariants() { - return visibleVariants; - } - - private void logVariantMap() { - for(Entry entry : originals.entrySet()) - Quark.LOG.info("{} is variant of {}", entry.getKey(), entry.getValue()); - } - - private static record ManualVariant(String type, Block out) {} - - private static record VariantMap(Map variants) { - - private boolean isEmpty() { - return variants.isEmpty(); - } - - } - -} diff --git a/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java b/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java new file mode 100644 index 0000000000..f3b353e90c --- /dev/null +++ b/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java @@ -0,0 +1,274 @@ +package org.violetmoon.quark.content.experimental.config; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.config.ConfigFlagManager; +import org.violetmoon.quark.base.config.type.IConfigType; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.*; + +public class VariantsConfig implements IConfigType { + + private static final VariantMap EMPTY_VARIANT_MAP = new VariantMap(new HashMap<>()); + + @Config(description = "The list of all variant types available for players to use. Values are treated as suffixes to block IDs for scanning.\n" + + "Prefix any variant type with ! to make it show up for Manual Variants but not be automatically scanned for. (e.g. '!polish')") + private List variantTypes = Arrays.asList("slab", "stairs", "wall", "fence", "fence_gate", "vertical_slab"); + + @Config(description = "By default, only a mod's namespace is scanned for variants for its items (e.g. if coolmod adds coolmod:fun_block, it'll search only for coolmod:fun_block_stairs).\n" + + " Mods in this list are also scanned for variants if none are found in itself (e.g. if quark is in the list and coolmod:fun_block_stairs doesn't exist, it'll try to look for quark:fun_block_stairs next)") + private List testedMods = Arrays.asList("quark"); + + @Config + private boolean printVariantMapToLog = false; + + @Config(description = "Format is 'alias=original' in each value (e.g. 'wall=fence' means that a failed search for, minecraft:cobblestone_fence will try cobblestone_wall next)") + private List aliases = Arrays.asList("carpet=slab", "pane=fence"); + + @Config(description = "Ends of block IDs to try and remove when looking for variants. (e.g. minecraft:oak_planks goes into minecraft:oak_stairs, so we have to include '_planks' in this list for it to find them or else it'll only look for minecraft:oak_planks_stairs)") + private List stripCandidates = Arrays.asList("_planks", "_wool", "_block", "s"); + + @Config(description = "Add manual variant overrides here, the format is 'type,block,output' (e.g. polish,minecraft:stone_bricks,minecraft:chiseled_stone_bricks). The type must be listed in Variant Types") + private List manualVariants = new ArrayList<>(); + + @Config(description = " A list of block IDs and mappings to be excluded from variant selection.\n" + + "To exclude a block from being turned into other blocks, just include the block ID (e.g. minecraft:cobblestone).\n" + + "To exclude a block from having other blocks turned into it, suffix it with = (e.g. =minecraft:cobblestone_stairs)\n" + + "To exclude a specific block->variant combination, put = between the two (e.g. minecraft:cobblestone=minecraft:cobblestone_stairs)") + private List blacklist = Arrays.asList("minecraft:snow", "minecraft:bamboo", "quark:bamboo_block"); + + private Map blockVariants = new HashMap<>(); + private Map originals = new HashMap<>(); + private Multimap aliasMap = HashMultimap.create(); + private Multimap manualVariantMap = HashMultimap.create(); + + private List visibleVariants = new ArrayList<>(); + private List sortedSuffixes; + + public VariantsConfig(List variantTypes, List testedMods, List aliases) { + this.variantTypes = variantTypes; + this.testedMods = testedMods; + this.aliases = aliases; + } + + @Override + public void onReload(ZetaModule module, ConfigFlagManager flagManager) { + blockVariants.clear(); + visibleVariants.clear(); + originals.clear(); + aliasMap.clear(); + manualVariantMap.clear(); + + if(module != null && !module.enabled) + return; + + for(String s : variantTypes) + visibleVariants.add(s.replaceAll("!", "")); + + sortedSuffixes = new ArrayList<>(visibleVariants); + sortedSuffixes.sort((s1, s2) -> { // sort by amount of _ + int ct1 = s1.replaceAll("[^_]", "").length(); + int ct2 = s2.replaceAll("[^_]", "").length(); + + return ct2 - ct1; + }); + + for(String s : aliases) { + String[] toks = s.split("="); + aliasMap.put(toks[1], toks[0]); + } + + for(String s : manualVariants) { + String[] toks = s.split(","); + + Block block = Registry.BLOCK.get(new ResourceLocation(toks[1])); + Block out = Registry.BLOCK.get(new ResourceLocation(toks[2])); + manualVariantMap.put(block, new ManualVariant(toks[0], out)); + } + + // Map all variants + Registry.BLOCK.forEach(this::getVariants); + + if(printVariantMapToLog) + logVariantMap(); + } + + public String getVariantForBlock(Block block) { + String name = Registry.BLOCK.getKey(block).getPath(); + + for(String suffix : sortedSuffixes) { + if(name.endsWith(String.format("_%s", suffix))) + return suffix; + + if(aliasMap.containsKey(suffix)) + for(String alias : aliasMap.get(suffix)) + if(name.endsWith(String.format("_%s", alias))) + return suffix; + } + + return null; + } + + public Block getBlockForTarget(Block block, Block target) { + return getBlockForVariant(block, getVariantForBlock(target)); + } + + public Block getBlockForVariant(Block block, String variant) { + blockVariants.clear(); + if(variant == null || !sortedSuffixes.contains(variant)) + return block; + + VariantMap map = getVariants(block); + Block ret = map.variants.get(variant); + if(ret != null) + return ret; + + return block; + } + + public Collection getAllVariants(Block block) { + Map map = getVariants(block).variants; + List blocks = new ArrayList<>(); + for(String s : variantTypes) { + if(s.startsWith("!")) + s = s.substring(1); + + if(map.containsKey(s)) + blocks.add(map.get(s)); + } + + return blocks; + } + + public Block getOriginalBlock(Block block) { + return originals.getOrDefault(block, block); + } + + public boolean isOriginal(Block block) { + return originals.containsValue(block); + } + + public boolean isVariant(Block block) { + return originals.containsKey(block); + } + + private VariantMap getVariants(Block block) { + if(blockVariants.containsKey(block)) + return blockVariants.get(block); + + Map newVariants = new HashMap<>(); + + if(!isBlacklisted(block, null)) + for(String s : sortedSuffixes) { + if(!variantTypes.contains(s)) + continue; // this means its marked with ! so it won't be searched + + Block suffixed = getSuffixedBlock(block, s); + if(suffixed != null && !isBlacklisted(null, suffixed) && !isBlacklisted(block, suffixed)) { + newVariants.put(s, suffixed); + originals.put(suffixed, block); + } + } + + if(manualVariantMap.containsKey(block)) + for(ManualVariant mv : manualVariantMap.get(block)) { + newVariants.put(mv.type, mv.out); + originals.put(mv.out, block); + } + + if(newVariants.isEmpty()) + blockVariants.put(block, EMPTY_VARIANT_MAP); + else blockVariants.put(block, new VariantMap(newVariants)); + + return getVariants(block); + } + + private Block getSuffixedBlock(Block ogBlock, String suffix) { + ResourceLocation resloc = Registry.BLOCK.getKey(ogBlock); + String namespace = resloc.getNamespace(); + String name = resloc.getPath(); + + Block ret = getSuffixedBlock(namespace, name, suffix); + if(ret != null) + return ret; + + for(String mod : testedMods) { + ret = getSuffixedBlock(mod, name, suffix); + if(ret != null) + return ret; + } + + return null; + } + + private Block getSuffixedBlock(String namespace, String name, String suffix) { + for(String strip : stripCandidates) + if(name.endsWith(strip)) { + String stripped = name.substring(0, name.length() - strip.length()); + Block strippedAttempt = getSuffixedBlock(namespace, stripped, suffix); + if(strippedAttempt != null) + return strippedAttempt; + } + + String targetStr = String.format("%s:%s_%s", namespace, name, suffix); + ResourceLocation target = new ResourceLocation(targetStr); + Block ret = Registry.BLOCK.get(target); + + if(ret == Blocks.AIR) { + if(aliasMap.containsKey(suffix)) + for(String alias : aliasMap.get(suffix)) { + Block aliasAttempt = getSuffixedBlock(namespace, name, alias); + if(aliasAttempt != null) + return aliasAttempt; + } + + return null; + } + + return ret; + } + + private boolean isBlacklisted(Block block, Block result) { + if(blacklist.isEmpty()) + return false; + + String search = ""; + if(block != null) + search += Registry.BLOCK.getKey(block).toString(); + if(result != null) + search += ("=" + Registry.BLOCK.getKey(result).toString()); + + return !search.isEmpty() && blacklist.contains(search); + } + + public boolean isKnownVariant(String variant) { + return visibleVariants.contains(variant); + } + + public List getVisibleVariants() { + return visibleVariants; + } + + private void logVariantMap() { + for(Map.Entry entry : originals.entrySet()) + Quark.LOG.info("{} is variant of {}", entry.getKey(), entry.getValue()); + } + + private static record ManualVariant(String type, Block out) {} + + private static record VariantMap(Map variants) { + + private boolean isEmpty() { + return variants.isEmpty(); + } + + } + +} \ No newline at end of file diff --git a/src/main/java/org/violetmoon/quark/content/experimental/item/HammerItem.java b/src/main/java/org/violetmoon/quark/content/experimental/item/HammerItem.java index 2240b7ab55..bea17fd145 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/item/HammerItem.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/item/HammerItem.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.experimental.item; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.item.QuarkItem; -import org.violetmoon.quark.content.experimental.module.VariantSelectorModule; -import org.violetmoon.quark.content.tweaks.module.LockRotationModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionResult; @@ -18,6 +11,12 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.item.QuarkItem; +import org.violetmoon.quark.content.experimental.module.VariantSelectorModule; +import org.violetmoon.quark.content.tweaks.module.LockRotationModule; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class HammerItem extends QuarkItem { @@ -26,7 +25,7 @@ public HammerItem(ZetaModule module) { .stacksTo(1) .tab(CreativeModeTab.TAB_TOOLS)); } - + @Nonnull @Override public InteractionResult useOn(UseOnContext context) { @@ -35,48 +34,57 @@ public InteractionResult useOn(UseOnContext context) { BlockPos pos = context.getClickedPos(); BlockState state = level.getBlockState(pos); Block block = state.getBlock(); - - String variant = VariantSelectorModule.getSavedVariant(player); - Block variantBlock = VariantSelectorModule.getVariantOrOriginal(block, variant); - if(variantBlock != null) { - BlockPlaceContext bpc = new YungsBetterBlockPlaceContext(context); - BlockState place = variantBlock.getStateForPlacement(bpc); - place = LockRotationModule.fixBlockRotation(place, bpc); - - if(!place.equals(state) && !level.isClientSide) { + + if (player != null) { + String variant = VariantSelectorModule.getSavedVariant(player); + Block variantBlock = VariantSelectorModule.getVariantOrOriginal(block, variant); + + if (variantBlock != null) { level.removeBlock(pos, false); - level.setBlock(pos, place, 1 | 2); - player.swing(context.getHand()); - - level.playSound(null, pos, variantBlock.getSoundType(place).getPlaceSound(), SoundSource.BLOCKS, 1.0F, 1.0F); + + BlockPlaceContext bpc = new YungsBetterBlockPlaceContext(context); + BlockState place = variantBlock.getStateForPlacement(bpc); + + place = LockRotationModule.fixBlockRotation(place, bpc); + + if (place != null && !place.equals(state) && !level.isClientSide) { + level.setBlock(pos, place, 1 | 2); + player.swing(context.getHand()); + + level.playSound(null, pos, place.getSoundType().getPlaceSound(), SoundSource.BLOCKS, 1.0F, 1.0F); + } else { + level.setBlock(pos, state, 0); + } + + return InteractionResult.SUCCESS; } - - return InteractionResult.SUCCESS; } - + return InteractionResult.PASS; } - + private static class YungsBetterBlockPlaceContext extends BlockPlaceContext { public YungsBetterBlockPlaceContext(UseOnContext ctx) { super(ctx); } - + // vanilla BlockPlaceContext offsets the original clicked pos if replaceClicked is false // so that the block is placed on the edge, but in this case we want to place it in the // same blockpos that was clicked so we do this nonsense - + + @Nonnull @Override public BlockPos getClickedPos() { boolean oldRepl = replaceClicked; + replaceClicked = true; BlockPos pos = super.getClickedPos(); - + replaceClicked = oldRepl; return pos; } - + } } diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentPredicatesModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentPredicatesModule.java index 001107211f..23ecbf74c2 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentPredicatesModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentPredicatesModule.java @@ -8,9 +8,6 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; - -import java.util.List; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.client.event.load.ZClientSetup; @@ -19,6 +16,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.RegistryUtil; +import java.util.List; + @ZetaLoadModule(category = "experimental", enabledByDefault = false, description = "This feature generates Resource Pack Item Model predicates on the items defined in 'Items to Change'\n" + "for the Enchantments defined in 'Enchantments to Register'.\n\n" diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentsBegoneModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentsBegoneModule.java index 26ef3fe859..37cd6b705e 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentsBegoneModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentsBegoneModule.java @@ -9,12 +9,6 @@ import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.EnchantmentInstance; - -import java.util.List; -import java.util.Map; -import java.util.function.Predicate; -import java.util.stream.Collectors; - import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; @@ -23,6 +17,11 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.List; +import java.util.Map; +import java.util.function.Predicate; +import java.util.stream.Collectors; + @ZetaLoadModule(category = "experimental", enabledByDefault = false) public class EnchantmentsBegoneModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/GameNerfsModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/GameNerfsModule.java index da43e549e6..988db0a656 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/GameNerfsModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/GameNerfsModule.java @@ -19,16 +19,8 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.Level; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.function.Predicate; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; -import org.violetmoon.zeta.event.*; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.bus.ZResult; @@ -41,6 +33,12 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.function.Predicate; + @ZetaLoadModule(category = "experimental", enabledByDefault = false) public class GameNerfsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/NarratorReadoutModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/NarratorReadoutModule.java index 4e3e85cfc6..be01a54bb6 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/NarratorReadoutModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/NarratorReadoutModule.java @@ -20,9 +20,6 @@ import net.minecraft.world.phys.HitResult; import net.minecraftforge.client.settings.KeyConflictContext; import net.minecraftforge.client.settings.KeyModifier; - -import java.util.List; - import org.violetmoon.quark.base.QuarkClient; import org.violetmoon.zeta.client.event.load.ZKeyMapping; import org.violetmoon.zeta.client.event.play.ZInput; @@ -31,6 +28,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.List; + @ZetaLoadModule(category = "experimental", enabledByDefault = false) public class NarratorReadoutModule extends ZetaModule { @ZetaLoadModule(clientReplacement = true) diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/SpawnerReplacerModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/SpawnerReplacerModule.java index b69b32d689..f563e9b549 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/SpawnerReplacerModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/SpawnerReplacerModule.java @@ -9,17 +9,16 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.SpawnerBlockEntity; import net.minecraft.world.level.block.state.BlockState; - -import java.util.List; -import java.util.Map; -import java.util.Optional; - import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZConfigChanged; import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.List; +import java.util.Map; +import java.util.Optional; + @ZetaLoadModule(category = "experimental", enabledByDefault = false) public class SpawnerReplacerModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java index af8768314c..c940c55066 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java @@ -40,9 +40,8 @@ import org.violetmoon.quark.base.network.message.experimental.PlaceVariantUpdateMessage; import org.violetmoon.quark.content.experimental.client.screen.VariantSelectorScreen; import org.violetmoon.quark.content.experimental.client.tooltip.VariantsComponent; -import org.violetmoon.quark.content.experimental.config.BlockSuffixConfig; +import org.violetmoon.quark.content.experimental.config.VariantsConfig; import org.violetmoon.quark.content.experimental.item.HammerItem; -import org.violetmoon.zeta.client.event.*; import org.violetmoon.zeta.client.event.load.ZKeyMapping; import org.violetmoon.zeta.client.event.load.ZTooltipComponents; import org.violetmoon.zeta.client.event.play.ZEndClientTick; @@ -83,7 +82,7 @@ public class VariantSelectorModule extends ZetaModule { @Config public static boolean overrideHeldItemRender = true; @Config - public static BlockSuffixConfig variants = new BlockSuffixConfig( + public static VariantsConfig variants = new VariantsConfig( Arrays.asList("slab", "stairs", "wall", "fence", "fence_gate", "vertical_slab"), Arrays.asList("quark"), Arrays.asList("carpet=slab") diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/VillagerRerollingReworkModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/VillagerRerollingReworkModule.java index f7d4b57ce3..f12e3e97ec 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/VillagerRerollingReworkModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/VillagerRerollingReworkModule.java @@ -1,5 +1,13 @@ package org.violetmoon.quark.content.experimental.module; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.Tag; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.npc.*; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.trading.MerchantOffer; +import net.minecraft.world.item.trading.MerchantOffers; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.experimental.hax.PseudoAccessorMerchantOffer; import org.violetmoon.quark.mixin.accessor.AccessorMerchantOffer; @@ -11,15 +19,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.Tag; -import net.minecraft.util.RandomSource; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.npc.*; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.trading.MerchantOffer; -import net.minecraft.world.item.trading.MerchantOffers; - @ZetaLoadModule(category = "experimental", enabledByDefault = false) public class VillagerRerollingReworkModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/management/client/screen/HeldShulkerBoxScreen.java b/src/main/java/org/violetmoon/quark/content/management/client/screen/HeldShulkerBoxScreen.java index 9abc7ab0e8..424ff828ef 100644 --- a/src/main/java/org/violetmoon/quark/content/management/client/screen/HeldShulkerBoxScreen.java +++ b/src/main/java/org/violetmoon/quark/content/management/client/screen/HeldShulkerBoxScreen.java @@ -1,14 +1,7 @@ package org.violetmoon.quark.content.management.client.screen; -import org.lwjgl.glfw.GLFW; -import org.violetmoon.quark.addons.oddities.client.screen.BackpackInventoryScreen; -import org.violetmoon.quark.addons.oddities.module.BackpackModule; -import org.violetmoon.quark.api.IQuarkButtonAllowed; -import org.violetmoon.quark.content.management.inventory.HeldShulkerBoxMenu; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.gui.screens.inventory.InventoryScreen; @@ -20,6 +13,10 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import org.lwjgl.glfw.GLFW; +import org.violetmoon.quark.addons.oddities.module.BackpackModule; +import org.violetmoon.quark.api.IQuarkButtonAllowed; +import org.violetmoon.quark.content.management.inventory.HeldShulkerBoxMenu; public class HeldShulkerBoxScreen extends AbstractContainerScreen implements IQuarkButtonAllowed { diff --git a/src/main/java/org/violetmoon/quark/content/management/client/screen/widgets/MiniInventoryButton.java b/src/main/java/org/violetmoon/quark/content/management/client/screen/widgets/MiniInventoryButton.java index 93d63513d2..fbce6a8dcf 100644 --- a/src/main/java/org/violetmoon/quark/content/management/client/screen/widgets/MiniInventoryButton.java +++ b/src/main/java/org/violetmoon/quark/content/management/client/screen/widgets/MiniInventoryButton.java @@ -1,20 +1,8 @@ package org.violetmoon.quark.content.management.client.screen.widgets; -import java.util.LinkedList; -import java.util.List; -import java.util.function.BooleanSupplier; -import java.util.function.Consumer; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.QuarkClient; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.zeta.client.TopLayerTooltipHandler; - import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.gui.screens.recipebook.RecipeUpdateListener; @@ -22,6 +10,14 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; +import org.violetmoon.quark.base.QuarkClient; +import org.violetmoon.quark.base.handler.MiscUtil; + +import javax.annotation.Nonnull; +import java.util.LinkedList; +import java.util.List; +import java.util.function.BooleanSupplier; +import java.util.function.Consumer; public class MiniInventoryButton extends Button { diff --git a/src/main/java/org/violetmoon/quark/content/management/inventory/HeldShulkerBoxContainer.java b/src/main/java/org/violetmoon/quark/content/management/inventory/HeldShulkerBoxContainer.java index 385a04e73c..1dfda0c74c 100644 --- a/src/main/java/org/violetmoon/quark/content/management/inventory/HeldShulkerBoxContainer.java +++ b/src/main/java/org/violetmoon/quark/content/management/inventory/HeldShulkerBoxContainer.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.content.management.inventory; -import org.violetmoon.quark.base.handler.SimilarBlockTypeHandler; -import org.violetmoon.quark.content.management.module.ExpandedItemInteractionsModule; -import org.violetmoon.zeta.util.ItemNBTHelper; - import net.minecraft.network.chat.Component; import net.minecraft.world.Container; import net.minecraft.world.MenuProvider; @@ -13,6 +9,9 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity; +import org.violetmoon.quark.base.handler.SimilarBlockTypeHandler; +import org.violetmoon.quark.content.management.module.ExpandedItemInteractionsModule; +import org.violetmoon.zeta.util.ItemNBTHelper; public class HeldShulkerBoxContainer implements Container, MenuProvider { diff --git a/src/main/java/org/violetmoon/quark/content/management/inventory/HeldShulkerBoxMenu.java b/src/main/java/org/violetmoon/quark/content/management/inventory/HeldShulkerBoxMenu.java index f3b05a0be7..52da21a2f2 100644 --- a/src/main/java/org/violetmoon/quark/content/management/inventory/HeldShulkerBoxMenu.java +++ b/src/main/java/org/violetmoon/quark/content/management/inventory/HeldShulkerBoxMenu.java @@ -1,8 +1,5 @@ package org.violetmoon.quark.content.management.inventory; -import org.violetmoon.quark.api.ISortingLockedSlots; -import org.violetmoon.quark.content.management.module.ExpandedItemInteractionsModule; - import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.Container; import net.minecraft.world.SimpleContainer; @@ -12,6 +9,8 @@ import net.minecraft.world.inventory.ShulkerBoxSlot; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; +import org.violetmoon.quark.api.ISortingLockedSlots; +import org.violetmoon.quark.content.management.module.ExpandedItemInteractionsModule; public class HeldShulkerBoxMenu extends AbstractContainerMenu implements ISortingLockedSlots { diff --git a/src/main/java/org/violetmoon/quark/content/management/module/AutomaticToolRestockModule.java b/src/main/java/org/violetmoon/quark/content/management/module/AutomaticToolRestockModule.java index 0fbe030085..02ae56474b 100644 --- a/src/main/java/org/violetmoon/quark/content/management/module/AutomaticToolRestockModule.java +++ b/src/main/java/org/violetmoon/quark/content/management/module/AutomaticToolRestockModule.java @@ -15,10 +15,6 @@ import net.minecraftforge.common.ToolActions; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.PlayerInvWrapper; - -import java.util.*; -import java.util.function.Predicate; - import org.violetmoon.quark.addons.oddities.module.BackpackModule; import org.violetmoon.quark.api.event.GatherToolClassesEvent; import org.violetmoon.quark.base.Quark; @@ -34,6 +30,9 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.RegistryUtil; +import java.util.*; +import java.util.function.Predicate; + @ZetaLoadModule(category = "management", antiOverlap = "inventorytweaks") public class AutomaticToolRestockModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/management/module/EasyTransferingModule.java b/src/main/java/org/violetmoon/quark/content/management/module/EasyTransferingModule.java index eafdd226f7..e406b10681 100644 --- a/src/main/java/org/violetmoon/quark/content/management/module/EasyTransferingModule.java +++ b/src/main/java/org/violetmoon/quark/content/management/module/EasyTransferingModule.java @@ -1,5 +1,7 @@ package org.violetmoon.quark.content.management.module; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.resources.language.I18n; import org.violetmoon.quark.base.client.handler.InventoryButtonHandler; import org.violetmoon.quark.base.client.handler.InventoryButtonHandler.ButtonTargetType; import org.violetmoon.quark.base.config.Config; @@ -11,9 +13,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.resources.language.I18n; - @ZetaLoadModule(category = "management") public class EasyTransferingModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/management/module/ExpandedItemInteractionsModule.java b/src/main/java/org/violetmoon/quark/content/management/module/ExpandedItemInteractionsModule.java index 9ba89b62d8..15aeefd93b 100644 --- a/src/main/java/org/violetmoon/quark/content/management/module/ExpandedItemInteractionsModule.java +++ b/src/main/java/org/violetmoon/quark/content/management/module/ExpandedItemInteractionsModule.java @@ -36,9 +36,6 @@ import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.wrapper.EmptyHandler; import net.minecraftforge.network.NetworkHooks; - -import java.util.List; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.GeneralConfig; @@ -61,6 +58,8 @@ import org.violetmoon.zeta.util.ItemNBTHelper; import org.violetmoon.zeta.util.RegistryUtil; +import java.util.List; + @ZetaLoadModule(category = "management") public class ExpandedItemInteractionsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/management/module/InventorySortingModule.java b/src/main/java/org/violetmoon/quark/content/management/module/InventorySortingModule.java index 67eb7ccde9..798365a4ef 100644 --- a/src/main/java/org/violetmoon/quark/content/management/module/InventorySortingModule.java +++ b/src/main/java/org/violetmoon/quark/content/management/module/InventorySortingModule.java @@ -4,9 +4,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.sounds.SoundEvents; - -import java.util.function.BooleanSupplier; - import org.violetmoon.quark.base.QuarkClient; import org.violetmoon.quark.base.client.handler.InventoryButtonHandler; import org.violetmoon.quark.base.config.Config; @@ -18,6 +15,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.function.BooleanSupplier; + @ZetaLoadModule(category = "management") public class InventorySortingModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/management/module/QuickArmorSwappingModule.java b/src/main/java/org/violetmoon/quark/content/management/module/QuickArmorSwappingModule.java index 7ad042ac7b..6cea201e47 100644 --- a/src/main/java/org/violetmoon/quark/content/management/module/QuickArmorSwappingModule.java +++ b/src/main/java/org/violetmoon/quark/content/management/module/QuickArmorSwappingModule.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.management.module; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerInteract; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.EquipmentSlot; @@ -13,6 +7,11 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.EnchantmentHelper; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.play.entity.player.ZPlayerInteract; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; @ZetaLoadModule(category = "management") public class QuickArmorSwappingModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/ai/ActWaryGoal.java b/src/main/java/org/violetmoon/quark/content/mobs/ai/ActWaryGoal.java index 30dcd9bc86..5d8ab96f7a 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/ai/ActWaryGoal.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/ai/ActWaryGoal.java @@ -10,18 +10,17 @@ */ package org.violetmoon.quark.content.mobs.ai; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; -import java.util.function.BooleanSupplier; - -import org.violetmoon.quark.base.util.MutableVectorHolder; -import org.violetmoon.quark.content.mobs.entity.Stoneling; - import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal; import net.minecraft.world.entity.player.Player; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.base.util.MutableVectorHolder; +import org.violetmoon.quark.content.mobs.entity.Stoneling; + +import java.util.List; +import java.util.Map; +import java.util.WeakHashMap; +import java.util.function.BooleanSupplier; public class ActWaryGoal extends WaterAvoidingRandomStrollGoal { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/ai/BarkAtDarknessGoal.java b/src/main/java/org/violetmoon/quark/content/mobs/ai/BarkAtDarknessGoal.java index 7277c0dacc..f1ccb1d43d 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/ai/BarkAtDarknessGoal.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/ai/BarkAtDarknessGoal.java @@ -6,11 +6,10 @@ import net.minecraft.world.entity.ai.goal.Goal; import net.minecraft.world.entity.ai.navigation.PathNavigation; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.content.mobs.entity.Shiba; import java.util.EnumSet; -import org.violetmoon.quark.content.mobs.entity.Shiba; - public class BarkAtDarknessGoal extends Goal { private final Shiba shiba; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/ai/DeliverFetchedItemGoal.java b/src/main/java/org/violetmoon/quark/content/mobs/ai/DeliverFetchedItemGoal.java index a970aaaf82..99417bf594 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/ai/DeliverFetchedItemGoal.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/ai/DeliverFetchedItemGoal.java @@ -1,8 +1,7 @@ package org.violetmoon.quark.content.mobs.ai; -import org.violetmoon.quark.content.mobs.entity.Shiba; - import net.minecraft.world.entity.ai.goal.FollowOwnerGoal; +import org.violetmoon.quark.content.mobs.entity.Shiba; public class DeliverFetchedItemGoal extends FollowOwnerGoal { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/ai/FavorBlockGoal.java b/src/main/java/org/violetmoon/quark/content/mobs/ai/FavorBlockGoal.java index 3e2f635daf..c9da05ebfe 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/ai/FavorBlockGoal.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/ai/FavorBlockGoal.java @@ -10,9 +10,6 @@ */ package org.violetmoon.quark.content.mobs.ai; -import java.util.EnumSet; -import java.util.function.Predicate; - import net.minecraft.core.BlockPos; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.PathfinderMob; @@ -22,6 +19,9 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; +import java.util.EnumSet; +import java.util.function.Predicate; + public class FavorBlockGoal extends Goal { private final PathfinderMob creature; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/ai/FetchArrowGoal.java b/src/main/java/org/violetmoon/quark/content/mobs/ai/FetchArrowGoal.java index 55d949198d..81a92c79b5 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/ai/FetchArrowGoal.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/ai/FetchArrowGoal.java @@ -4,12 +4,11 @@ import net.minecraft.world.entity.ai.navigation.PathNavigation; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; - -import java.util.EnumSet; - import org.violetmoon.quark.content.mobs.entity.Shiba; import org.violetmoon.quark.mixin.accessor.AccessorAbstractArrow; +import java.util.EnumSet; + public class FetchArrowGoal extends Goal { private final Shiba shiba; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/ai/FindPlaceToSleepGoal.java b/src/main/java/org/violetmoon/quark/content/mobs/ai/FindPlaceToSleepGoal.java index 0d5c6445c6..33e4033e8d 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/ai/FindPlaceToSleepGoal.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/ai/FindPlaceToSleepGoal.java @@ -17,12 +17,11 @@ import net.minecraft.world.level.block.entity.FurnaceBlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.mobs.entity.Foxhound; +import javax.annotation.Nonnull; + public class FindPlaceToSleepGoal extends MoveToBlockGoal { private final Foxhound foxhound; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/ai/RaveGoal.java b/src/main/java/org/violetmoon/quark/content/mobs/ai/RaveGoal.java index 7f5a28624f..11013dc879 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/ai/RaveGoal.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/ai/RaveGoal.java @@ -10,11 +10,10 @@ */ package org.violetmoon.quark.content.mobs.ai; -import java.util.EnumSet; - +import net.minecraft.world.entity.ai.goal.Goal; import org.violetmoon.quark.content.mobs.entity.Crab; -import net.minecraft.world.entity.ai.goal.Goal; +import java.util.EnumSet; public class RaveGoal extends Goal { private final Crab crab; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/ai/RunAndPoofGoal.java b/src/main/java/org/violetmoon/quark/content/mobs/ai/RunAndPoofGoal.java index c7c5c6bd56..4a1337371a 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/ai/RunAndPoofGoal.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/ai/RunAndPoofGoal.java @@ -10,13 +10,6 @@ */ package org.violetmoon.quark.content.mobs.ai; -import java.util.EnumSet; -import java.util.List; -import java.util.function.Predicate; - -import org.violetmoon.quark.base.handler.QuarkSounds; -import org.violetmoon.quark.content.mobs.entity.Stoneling; - import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; @@ -31,6 +24,12 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.pathfinder.Path; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.base.handler.QuarkSounds; +import org.violetmoon.quark.content.mobs.entity.Stoneling; + +import java.util.EnumSet; +import java.util.List; +import java.util.function.Predicate; public class RunAndPoofGoal extends Goal { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/ai/SleepGoal.java b/src/main/java/org/violetmoon/quark/content/mobs/ai/SleepGoal.java index 163bb00e61..60886944ee 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/ai/SleepGoal.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/ai/SleepGoal.java @@ -10,13 +10,12 @@ */ package org.violetmoon.quark.content.mobs.ai; -import java.util.EnumSet; - -import org.violetmoon.quark.content.mobs.entity.Foxhound; - import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.ai.goal.Goal; +import org.violetmoon.quark.content.mobs.entity.Foxhound; + +import java.util.EnumSet; public class SleepGoal extends Goal { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/CrabMoldLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/CrabMoldLayer.java index 3476da6c8b..6d886426cf 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/CrabMoldLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/CrabMoldLayer.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.content.mobs.client.layer; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.RenderLayerParent; import net.minecraft.client.renderer.entity.layers.RenderLayer; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.mobs.client.model.CrabModel; import org.violetmoon.quark.content.mobs.entity.Crab; +import javax.annotation.Nonnull; + public class CrabMoldLayer extends RenderLayer { private static final ResourceLocation MOLD_LAYER = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/crab/mold_layer.png"); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/FoxhoundCollarLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/FoxhoundCollarLayer.java index 7ed755846a..4de1519f35 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/FoxhoundCollarLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/FoxhoundCollarLayer.java @@ -11,18 +11,16 @@ package org.violetmoon.quark.content.mobs.client.layer; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.RenderLayerParent; import net.minecraft.client.renderer.entity.layers.RenderLayer; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.mobs.client.model.FoxhoundModel; import org.violetmoon.quark.content.mobs.entity.Foxhound; +import javax.annotation.Nonnull; + public class FoxhoundCollarLayer extends RenderLayer { private static final ResourceLocation WOLF_COLLAR = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/collar.png"); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingItemLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingItemLayer.java index d0cc49d7ec..b923c68db5 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingItemLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingItemLayer.java @@ -12,7 +12,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType; @@ -23,12 +22,11 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.content.mobs.client.model.StonelingModel; import org.violetmoon.quark.content.mobs.entity.Stoneling; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) public class StonelingItemLayer extends RenderLayer { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingLichenLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingLichenLayer.java index 4efe8ece23..a2d72d0557 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingLichenLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingLichenLayer.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.content.mobs.client.layer; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.RenderLayerParent; import net.minecraft.client.renderer.entity.layers.RenderLayer; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.mobs.client.model.StonelingModel; import org.violetmoon.quark.content.mobs.entity.Stoneling; +import javax.annotation.Nonnull; + public class StonelingLichenLayer extends RenderLayer { private static final ResourceLocation MOLD_LAYER = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/stoneling/lichen_layer.png"); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/ToretoiseOreLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/ToretoiseOreLayer.java index f07660d877..a0cc719674 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/ToretoiseOreLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/ToretoiseOreLayer.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.content.mobs.client.layer; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.RenderLayerParent; import net.minecraft.client.renderer.entity.layers.RenderLayer; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.mobs.client.model.ToretoiseModel; import org.violetmoon.quark.content.mobs.entity.Toretoise; +import javax.annotation.Nonnull; + public class ToretoiseOreLayer extends RenderLayer { private static final String ORE_BASE = Quark.MOD_ID + ":textures/model/entity/toretoise/ore%d.png"; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenClothingLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenClothingLayer.java index c22f395183..335b4c4bbb 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenClothingLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenClothingLayer.java @@ -1,7 +1,6 @@ package org.violetmoon.quark.content.mobs.client.layer.forgotten; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.SkeletonModel; import net.minecraft.client.model.geom.EntityModelSet; @@ -14,11 +13,10 @@ import net.minecraft.world.entity.monster.RangedAttackMob; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.Quark; import javax.annotation.Nonnull; -import org.violetmoon.quark.base.Quark; - @OnlyIn(Dist.CLIENT) public class ForgottenClothingLayer> extends RenderLayer { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenEyesLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenEyesLayer.java index 06bb07bb76..5bd14afd7e 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenEyesLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenEyesLayer.java @@ -8,11 +8,10 @@ import net.minecraft.world.entity.monster.Skeleton; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.Quark; import javax.annotation.Nonnull; -import org.violetmoon.quark.base.Quark; - @OnlyIn(Dist.CLIENT) public class ForgottenEyesLayer> extends EyesLayer { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenSheathedItemLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenSheathedItemLayer.java index b572a5824f..e842dc14cb 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenSheathedItemLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenSheathedItemLayer.java @@ -1,12 +1,7 @@ package org.violetmoon.quark.content.mobs.client.layer.forgotten; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.mobs.entity.Forgotten; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; - import net.minecraft.client.model.EntityModel; import net.minecraft.client.renderer.ItemInHandRenderer; import net.minecraft.client.renderer.MultiBufferSource; @@ -16,6 +11,9 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.content.mobs.entity.Forgotten; + +import javax.annotation.Nonnull; @OnlyIn(Dist.CLIENT) public class ForgottenSheathedItemLayer> extends RenderLayer { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaCollarLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaCollarLayer.java index ff8d20fbcd..b93b907d9b 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaCollarLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaCollarLayer.java @@ -11,18 +11,16 @@ package org.violetmoon.quark.content.mobs.client.layer.shiba; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.RenderLayerParent; import net.minecraft.client.renderer.entity.layers.RenderLayer; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.mobs.client.model.ShibaModel; import org.violetmoon.quark.content.mobs.entity.Shiba; +import javax.annotation.Nonnull; + public class ShibaCollarLayer extends RenderLayer { private static final ResourceLocation WOLF_COLLAR = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/shiba/collar.png"); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaMouthItemLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaMouthItemLayer.java index 881b6a3ac7..506f76d48a 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaMouthItemLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaMouthItemLayer.java @@ -1,13 +1,7 @@ package org.violetmoon.quark.content.mobs.client.layer.shiba; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.mobs.client.model.ShibaModel; -import org.violetmoon.quark.content.mobs.entity.Shiba; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; - import net.minecraft.client.renderer.ItemInHandRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.model.ItemTransforms; @@ -16,6 +10,10 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.SwordItem; import net.minecraft.world.item.TridentItem; +import org.violetmoon.quark.content.mobs.client.model.ShibaModel; +import org.violetmoon.quark.content.mobs.entity.Shiba; + +import javax.annotation.Nonnull; public class ShibaMouthItemLayer extends RenderLayer { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/model/CrabModel.java b/src/main/java/org/violetmoon/quark/content/mobs/client/model/CrabModel.java index 78a2d83ace..d2f15f846d 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/model/CrabModel.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/model/CrabModel.java @@ -12,11 +12,9 @@ import net.minecraft.client.model.geom.builders.MeshDefinition; import net.minecraft.client.model.geom.builders.PartDefinition; import net.minecraft.util.Mth; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.content.mobs.entity.Crab; +import javax.annotation.Nonnull; import java.util.Set; public class CrabModel extends EntityModel { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/model/ForgottenHatModel.java b/src/main/java/org/violetmoon/quark/content/mobs/client/model/ForgottenHatModel.java index 8cf064e9e7..8beca45813 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/model/ForgottenHatModel.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/model/ForgottenHatModel.java @@ -1,7 +1,5 @@ package org.violetmoon.quark.content.mobs.client.model; -import org.violetmoon.quark.base.client.render.QuarkArmorModel; - import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.builders.CubeDeformation; import net.minecraft.client.model.geom.builders.CubeListBuilder; @@ -9,6 +7,7 @@ import net.minecraft.client.model.geom.builders.PartDefinition; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.client.render.QuarkArmorModel; @OnlyIn(Dist.CLIENT) public class ForgottenHatModel { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/model/FoxhoundModel.java b/src/main/java/org/violetmoon/quark/content/mobs/client/model/FoxhoundModel.java index b2e3258a09..d20571f9ae 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/model/FoxhoundModel.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/model/FoxhoundModel.java @@ -3,7 +3,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Vector3f; - import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,11 +11,10 @@ import net.minecraft.client.model.geom.builders.MeshDefinition; import net.minecraft.client.model.geom.builders.PartDefinition; import net.minecraft.util.Mth; +import org.violetmoon.quark.content.mobs.entity.Foxhound; import javax.annotation.Nonnull; -import org.violetmoon.quark.content.mobs.entity.Foxhound; - /** * ModelFoxhound - McVinnyq * Created using Tabula 7.0.0 diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/model/ShibaModel.java b/src/main/java/org/violetmoon/quark/content/mobs/client/model/ShibaModel.java index baf29f6218..38ab4a65b9 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/model/ShibaModel.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/model/ShibaModel.java @@ -2,7 +2,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; - import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -13,11 +12,10 @@ import net.minecraft.tags.BlockTags; import net.minecraft.util.Mth; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.content.mobs.entity.Shiba; import javax.annotation.Nonnull; -import org.violetmoon.quark.content.mobs.entity.Shiba; - public class ShibaModel extends EntityModel { private final ModelPart main; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/model/StonelingModel.java b/src/main/java/org/violetmoon/quark/content/mobs/client/model/StonelingModel.java index a312ce7ebe..9ad87ec5ab 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/model/StonelingModel.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/model/StonelingModel.java @@ -2,22 +2,16 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; - import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; -import net.minecraft.client.model.geom.builders.CubeDeformation; -import net.minecraft.client.model.geom.builders.CubeListBuilder; -import net.minecraft.client.model.geom.builders.LayerDefinition; -import net.minecraft.client.model.geom.builders.MeshDefinition; -import net.minecraft.client.model.geom.builders.PartDefinition; +import net.minecraft.client.model.geom.builders.*; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; +import org.violetmoon.quark.content.mobs.entity.Stoneling; import javax.annotation.Nonnull; -import org.violetmoon.quark.content.mobs.entity.Stoneling; - public class StonelingModel extends EntityModel { private final ModelPart body; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/model/ToretoiseModel.java b/src/main/java/org/violetmoon/quark/content/mobs/client/model/ToretoiseModel.java index bcdb706694..9767281579 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/model/ToretoiseModel.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/model/ToretoiseModel.java @@ -11,12 +11,10 @@ import net.minecraft.client.model.geom.builders.LayerDefinition; import net.minecraft.client.model.geom.builders.MeshDefinition; import net.minecraft.client.model.geom.builders.PartDefinition; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.QuarkClient; import org.violetmoon.quark.content.mobs.entity.Toretoise; +import javax.annotation.Nonnull; import java.util.function.BiConsumer; public class ToretoiseModel extends EntityModel { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/model/WraithModel.java b/src/main/java/org/violetmoon/quark/content/mobs/client/model/WraithModel.java index 4d2d05ab53..218737497c 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/model/WraithModel.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/model/WraithModel.java @@ -1,23 +1,16 @@ package org.violetmoon.quark.content.mobs.client.model; -import java.util.Random; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.mobs.entity.Wraith; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; - import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; -import net.minecraft.client.model.geom.builders.CubeDeformation; -import net.minecraft.client.model.geom.builders.CubeListBuilder; -import net.minecraft.client.model.geom.builders.LayerDefinition; -import net.minecraft.client.model.geom.builders.MeshDefinition; -import net.minecraft.client.model.geom.builders.PartDefinition; +import net.minecraft.client.model.geom.builders.*; import net.minecraft.client.renderer.RenderType; +import org.violetmoon.quark.content.mobs.entity.Wraith; + +import javax.annotation.Nonnull; +import java.util.Random; public class WraithModel extends EntityModel { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/CrabRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/CrabRenderer.java index d94b44fb05..366020da30 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/CrabRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/CrabRenderer.java @@ -3,14 +3,13 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.client.handler.ModelHandler; import org.violetmoon.quark.content.mobs.client.layer.CrabMoldLayer; import org.violetmoon.quark.content.mobs.client.model.CrabModel; import org.violetmoon.quark.content.mobs.entity.Crab; +import javax.annotation.Nonnull; + public class CrabRenderer extends MobRenderer { private static final ResourceLocation[] TEXTURES = new ResourceLocation[] { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ForgottenRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ForgottenRenderer.java index da838bfe47..22ddbffc53 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ForgottenRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ForgottenRenderer.java @@ -1,19 +1,17 @@ package org.violetmoon.quark.content.mobs.client.render.entity; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.SkeletonRenderer; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.monster.AbstractSkeleton; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.mobs.client.layer.forgotten.ForgottenClothingLayer; import org.violetmoon.quark.content.mobs.client.layer.forgotten.ForgottenEyesLayer; import org.violetmoon.quark.content.mobs.client.layer.forgotten.ForgottenSheathedItemLayer; +import javax.annotation.Nonnull; + public class ForgottenRenderer extends SkeletonRenderer { private static final ResourceLocation TEXTURE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/forgotten/main.png"); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/FoxhoundRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/FoxhoundRenderer.java index aba76ce00e..0334c04807 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/FoxhoundRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/FoxhoundRenderer.java @@ -13,15 +13,13 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.client.handler.ModelHandler; import org.violetmoon.quark.content.mobs.client.layer.FoxhoundCollarLayer; import org.violetmoon.quark.content.mobs.client.model.FoxhoundModel; import org.violetmoon.quark.content.mobs.entity.Foxhound; +import javax.annotation.Nonnull; import java.util.UUID; public class FoxhoundRenderer extends MobRenderer { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ShibaRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ShibaRenderer.java index dccdac43f2..1b3d9d87c0 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ShibaRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ShibaRenderer.java @@ -3,9 +3,6 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.client.handler.ModelHandler; import org.violetmoon.quark.content.mobs.client.layer.shiba.ShibaCollarLayer; @@ -13,6 +10,8 @@ import org.violetmoon.quark.content.mobs.client.model.ShibaModel; import org.violetmoon.quark.content.mobs.entity.Shiba; +import javax.annotation.Nonnull; + public class ShibaRenderer extends MobRenderer { private static final ResourceLocation[] SHIBA_BASES = { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/SoulBeadRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/SoulBeadRenderer.java index a07c2fd90f..9d7096a1ba 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/SoulBeadRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/SoulBeadRenderer.java @@ -5,11 +5,10 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.quark.content.mobs.entity.SoulBead; import javax.annotation.Nonnull; -import org.violetmoon.quark.content.mobs.entity.SoulBead; - public class SoulBeadRenderer extends EntityRenderer { public SoulBeadRenderer(EntityRendererProvider.Context context) { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/StonelingRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/StonelingRenderer.java index 230af12458..37a2e449cb 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/StonelingRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/StonelingRenderer.java @@ -1,18 +1,17 @@ package org.violetmoon.quark.content.mobs.client.render.entity; -import javax.annotation.Nonnull; - +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.entity.MobRenderer; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.violetmoon.quark.base.client.handler.ModelHandler; import org.violetmoon.quark.content.mobs.client.layer.StonelingItemLayer; import org.violetmoon.quark.content.mobs.client.layer.StonelingLichenLayer; import org.violetmoon.quark.content.mobs.client.model.StonelingModel; import org.violetmoon.quark.content.mobs.entity.Stoneling; -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import net.minecraft.client.renderer.entity.MobRenderer; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; @OnlyIn(Dist.CLIENT) public class StonelingRenderer extends MobRenderer { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ToretoiseRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ToretoiseRenderer.java index aabea69d6d..36d27d4844 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ToretoiseRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ToretoiseRenderer.java @@ -3,15 +3,14 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.client.handler.ModelHandler; import org.violetmoon.quark.content.mobs.client.layer.ToretoiseOreLayer; import org.violetmoon.quark.content.mobs.client.model.ToretoiseModel; import org.violetmoon.quark.content.mobs.entity.Toretoise; +import javax.annotation.Nonnull; + public class ToretoiseRenderer extends MobRenderer{ private static final ResourceLocation BASE_TEXTURE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/toretoise/base.png"); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/WraithRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/WraithRenderer.java index 896f314bdf..27d173e654 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/WraithRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/WraithRenderer.java @@ -3,13 +3,12 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.client.handler.ModelHandler; import org.violetmoon.quark.content.mobs.client.model.WraithModel; import org.violetmoon.quark.content.mobs.entity.Wraith; +import javax.annotation.Nonnull; + public class WraithRenderer extends MobRenderer { private static final ResourceLocation TEXTURE = new ResourceLocation("quark", "textures/model/entity/wraith.png"); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java index 2115f2eefa..07ae2cc45b 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java @@ -57,15 +57,13 @@ import net.minecraftforge.entity.IEntityAdditionalSpawnData; import net.minecraftforge.fluids.FluidType; import net.minecraftforge.network.NetworkHooks; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.content.mobs.ai.RaveGoal; import org.violetmoon.quark.content.mobs.module.CrabsModule; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.BiConsumer; public class Crab extends Animal implements IEntityAdditionalSpawnData, Bucketable { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Forgotten.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Forgotten.java index 279be7c3dc..240d844525 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Forgotten.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Forgotten.java @@ -1,19 +1,6 @@ package org.violetmoon.quark.content.mobs.entity; -import java.util.List; -import java.util.stream.Stream; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.content.mobs.module.ForgottenModule; -import org.violetmoon.quark.content.tools.module.ColorRunesModule; -import org.violetmoon.zeta.util.ItemNBTHelper; - import com.google.common.collect.ImmutableSet; - import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; @@ -27,13 +14,7 @@ import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EntityDimensions; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.MobSpawnType; -import net.minecraft.world.entity.Pose; -import net.minecraft.world.entity.SpawnGroupData; +import net.minecraft.world.entity.*; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.goal.Goal; @@ -53,6 +34,16 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.content.mobs.module.ForgottenModule; +import org.violetmoon.quark.content.tools.module.ColorRunesModule; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; +import java.util.stream.Stream; public class Forgotten extends Skeleton { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java index 153bd27dd7..2e9a3d8129 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java @@ -10,25 +10,6 @@ */ package org.violetmoon.quark.content.mobs.entity; -import static org.violetmoon.quark.content.mobs.ai.FindPlaceToSleepGoal.Target.FURNACE; -import static org.violetmoon.quark.content.mobs.ai.FindPlaceToSleepGoal.Target.GLOWING; -import static org.violetmoon.quark.content.mobs.ai.FindPlaceToSleepGoal.Target.LIT_FURNACE; - -import java.util.List; -import java.util.Optional; -import java.util.UUID; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.block.TinyPotatoBlock; -import org.violetmoon.quark.addons.oddities.module.TinyPotatoModule; -import org.violetmoon.quark.base.handler.QuarkSounds; -import org.violetmoon.quark.content.mobs.ai.FindPlaceToSleepGoal; -import org.violetmoon.quark.content.mobs.ai.SleepGoal; -import org.violetmoon.quark.content.mobs.module.FoxhoundModule; -import org.violetmoon.quark.content.tweaks.ai.WantLoveGoal; -import org.violetmoon.zeta.util.ItemNBTHelper; - import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.particles.ParticleTypes; @@ -49,24 +30,9 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.AgeableMob; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.MobSpawnType; -import net.minecraft.world.entity.Pose; -import net.minecraft.world.entity.SpawnGroupData; +import net.minecraft.world.entity.*; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.entity.ai.goal.BegGoal; -import net.minecraft.world.entity.ai.goal.BreedGoal; -import net.minecraft.world.entity.ai.goal.FloatGoal; -import net.minecraft.world.entity.ai.goal.FollowOwnerGoal; -import net.minecraft.world.entity.ai.goal.LeapAtTargetGoal; -import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal; -import net.minecraft.world.entity.ai.goal.MeleeAttackGoal; -import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal; -import net.minecraft.world.entity.ai.goal.SitWhenOrderedToGoal; -import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal; +import net.minecraft.world.entity.ai.goal.*; import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal; import net.minecraft.world.entity.ai.goal.target.NonTameRandomTargetGoal; import net.minecraft.world.entity.ai.goal.target.OwnerHurtTargetGoal; @@ -90,6 +56,21 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.addons.oddities.block.TinyPotatoBlock; +import org.violetmoon.quark.addons.oddities.module.TinyPotatoModule; +import org.violetmoon.quark.base.handler.QuarkSounds; +import org.violetmoon.quark.content.mobs.ai.FindPlaceToSleepGoal; +import org.violetmoon.quark.content.mobs.ai.SleepGoal; +import org.violetmoon.quark.content.mobs.module.FoxhoundModule; +import org.violetmoon.quark.content.tweaks.ai.WantLoveGoal; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import static org.violetmoon.quark.content.mobs.ai.FindPlaceToSleepGoal.Target.*; public class Foxhound extends Wolf implements Enemy { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Shiba.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Shiba.java index a961524b0d..e0b44a3548 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Shiba.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Shiba.java @@ -1,17 +1,5 @@ package org.violetmoon.quark.content.mobs.entity; -import java.util.List; -import java.util.UUID; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.mobs.ai.BarkAtDarknessGoal; -import org.violetmoon.quark.content.mobs.ai.DeliverFetchedItemGoal; -import org.violetmoon.quark.content.mobs.ai.FetchArrowGoal; -import org.violetmoon.quark.content.mobs.module.ShibaModule; -import org.violetmoon.quark.content.tweaks.ai.NuzzleGoal; -import org.violetmoon.quark.content.tweaks.ai.WantLoveGoal; - import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; @@ -26,30 +14,14 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.entity.AgeableMob; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.TamableAnimal; +import net.minecraft.world.entity.*; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.entity.ai.goal.BreedGoal; -import net.minecraft.world.entity.ai.goal.FloatGoal; -import net.minecraft.world.entity.ai.goal.FollowOwnerGoal; -import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal; -import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal; -import net.minecraft.world.entity.ai.goal.SitWhenOrderedToGoal; -import net.minecraft.world.entity.ai.goal.TemptGoal; -import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal; +import net.minecraft.world.entity.ai.goal.*; import net.minecraft.world.entity.animal.Animal; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.DyeItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.*; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.Level; @@ -59,6 +31,16 @@ import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.content.mobs.ai.BarkAtDarknessGoal; +import org.violetmoon.quark.content.mobs.ai.DeliverFetchedItemGoal; +import org.violetmoon.quark.content.mobs.ai.FetchArrowGoal; +import org.violetmoon.quark.content.mobs.module.ShibaModule; +import org.violetmoon.quark.content.tweaks.ai.NuzzleGoal; +import org.violetmoon.quark.content.tweaks.ai.WantLoveGoal; + +import javax.annotation.Nonnull; +import java.util.List; +import java.util.UUID; public class Shiba extends TamableAnimal { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/SoulBead.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/SoulBead.java index e4564768a8..33092f6e9b 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/SoulBead.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/SoulBead.java @@ -1,11 +1,6 @@ package org.violetmoon.quark.content.mobs.entity; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.handler.QuarkSounds; - import com.mojang.math.Vector3f; - import net.minecraft.core.particles.BlockParticleOption; import net.minecraft.core.particles.DustParticleOptions; import net.minecraft.core.particles.ParticleTypes; @@ -21,6 +16,9 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.Vec3; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.base.handler.QuarkSounds; + +import javax.annotation.Nonnull; public class SoulBead extends Entity { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Stoneling.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Stoneling.java index eae75cf672..fa4b90e0ec 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Stoneling.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Stoneling.java @@ -1,30 +1,7 @@ package org.violetmoon.quark.content.mobs.entity; -import static org.violetmoon.quark.content.world.module.NewStoneTypesModule.jasperBlock; -import static org.violetmoon.quark.content.world.module.NewStoneTypesModule.limestoneBlock; -import static org.violetmoon.quark.content.world.module.NewStoneTypesModule.polishedBlocks; -import static org.violetmoon.quark.content.world.module.NewStoneTypesModule.shaleBlock; - -import java.util.List; -import java.util.Set; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.base.handler.QuarkSounds; -import org.violetmoon.quark.base.util.IfFlagGoal; -import org.violetmoon.quark.content.mobs.ai.ActWaryGoal; -import org.violetmoon.quark.content.mobs.ai.FavorBlockGoal; -import org.violetmoon.quark.content.mobs.ai.RunAndPoofGoal; -import org.violetmoon.quark.content.mobs.module.StonelingsModule; -import org.violetmoon.quark.content.tools.entity.rang.Pickarang; -import org.violetmoon.quark.content.world.module.GlimmeringWealdModule; - import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import net.minecraft.core.BlockPos; import net.minecraft.core.particles.BlockParticleOption; import net.minecraft.core.particles.ParticleTypes; @@ -43,13 +20,7 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.Mob; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.entity.MobSpawnType; -import net.minecraft.world.entity.PathfinderMob; -import net.minecraft.world.entity.SpawnGroupData; +import net.minecraft.world.entity.*; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.goal.TemptGoal; @@ -61,11 +32,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.level.ClipContext; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.ServerLevelAccessor; +import net.minecraft.world.level.*; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; @@ -79,6 +46,23 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraftforge.common.Tags; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.base.handler.QuarkSounds; +import org.violetmoon.quark.base.util.IfFlagGoal; +import org.violetmoon.quark.content.mobs.ai.ActWaryGoal; +import org.violetmoon.quark.content.mobs.ai.FavorBlockGoal; +import org.violetmoon.quark.content.mobs.ai.RunAndPoofGoal; +import org.violetmoon.quark.content.mobs.module.StonelingsModule; +import org.violetmoon.quark.content.tools.entity.rang.Pickarang; +import org.violetmoon.quark.content.world.module.GlimmeringWealdModule; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; +import java.util.Set; + +import static org.violetmoon.quark.content.world.module.NewStoneTypesModule.*; public class Stoneling extends PathfinderMob { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Toretoise.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Toretoise.java index 11a6674d14..5eb8cff413 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Toretoise.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Toretoise.java @@ -43,16 +43,13 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.AABB; import net.minecraftforge.common.ToolActions; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.MiscUtil; import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.content.mobs.module.ToretoiseModule; +import javax.annotation.Nonnull; import java.util.List; -import java.util.Objects; public class Toretoise extends Animal { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Wraith.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Wraith.java index 087cfe1c4e..0177427d3f 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Wraith.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Wraith.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.content.mobs.entity; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.mobs.module.WraithModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; import net.minecraft.core.particles.ParticleTypes; @@ -19,11 +15,7 @@ import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.MobSpawnType; -import net.minecraft.world.entity.SpawnGroupData; +import net.minecraft.world.entity.*; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.monster.Monster; @@ -35,6 +27,9 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.content.mobs.module.WraithModule; + +import javax.annotation.Nonnull; public class Wraith extends Zombie { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/item/DiamondHeartItem.java b/src/main/java/org/violetmoon/quark/content/mobs/item/DiamondHeartItem.java index a6cabd5e32..8e4b96d65d 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/item/DiamondHeartItem.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/item/DiamondHeartItem.java @@ -19,15 +19,14 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.item.QuarkItem; import org.violetmoon.quark.content.mobs.entity.Stoneling; import org.violetmoon.quark.content.mobs.entity.Stoneling.StonelingVariant; import org.violetmoon.quark.content.mobs.module.StonelingsModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + public class DiamondHeartItem extends QuarkItem { public DiamondHeartItem(String regname, ZetaModule module, Properties properties) { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/item/ForgottenHatItem.java b/src/main/java/org/violetmoon/quark/content/mobs/item/ForgottenHatItem.java index eab05f39c5..18f5773604 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/item/ForgottenHatItem.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/item/ForgottenHatItem.java @@ -16,14 +16,12 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.extensions.common.IClientItemExtensions; import net.minecraftforge.common.ForgeMod; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.client.handler.ModelHandler; import org.violetmoon.zeta.item.IZetaItem; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.UUID; import java.util.function.BooleanSupplier; import java.util.function.Consumer; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/item/SoulBeadItem.java b/src/main/java/org/violetmoon/quark/content/mobs/item/SoulBeadItem.java index ede03ee1b1..bf12f5d2ff 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/item/SoulBeadItem.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/item/SoulBeadItem.java @@ -13,15 +13,14 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.base.item.QuarkItem; import org.violetmoon.quark.content.mobs.entity.SoulBead; import org.violetmoon.quark.content.mobs.module.WraithModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + public class SoulBeadItem extends QuarkItem { public SoulBeadItem(ZetaModule module) { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java index d0a8d8e798..96f5a67177 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java @@ -1,5 +1,26 @@ package org.violetmoon.quark.content.mobs.module; +import com.google.common.collect.ImmutableSet; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BiomeTags; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.entity.SpawnPlacements.Type; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.food.FoodProperties; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.levelgen.Heightmap.Types; +import net.minecraft.world.level.material.Fluids; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.CompoundBiomeConfig; @@ -24,28 +45,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import com.google.common.collect.ImmutableSet; -import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BiomeTags; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.effect.MobEffect; -import net.minecraft.world.effect.MobEffectCategory; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.entity.SpawnPlacements.Type; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.food.FoodProperties; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.levelgen.Heightmap.Types; -import net.minecraft.world.level.material.Fluids; - /** * @author WireSegal * Created at 7:28 PM on 9/22/19. diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/ForgottenModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/ForgottenModule.java index adef189615..b9d4e4e2a9 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/module/ForgottenModule.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/module/ForgottenModule.java @@ -1,5 +1,16 @@ package org.violetmoon.quark.content.mobs.module; +import com.google.common.collect.ImmutableSet; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.core.Registry; +import net.minecraft.world.entity.*; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingSpawnEvent; +import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn; +import net.minecraftforge.eventbus.api.Event.Result; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.EntityAttributeHandler; @@ -19,18 +30,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import com.google.common.collect.ImmutableSet; -import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.core.Registry; -import net.minecraft.world.entity.*; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.phys.Vec3; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn; -import net.minecraftforge.eventbus.api.Event.Result; - @ZetaLoadModule(category = "mobs") public class ForgottenModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/FoxhoundModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/FoxhoundModule.java index d3e07bbb42..745ad71cf7 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/module/FoxhoundModule.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/module/FoxhoundModule.java @@ -15,9 +15,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.Heightmap; - -import static net.minecraftforge.event.entity.living.LivingChangeTargetEvent.LivingTargetType.BEHAVIOR_TARGET; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.CompoundBiomeConfig; @@ -42,6 +39,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import static net.minecraftforge.event.entity.living.LivingChangeTargetEvent.LivingTargetType.BEHAVIOR_TARGET; + /** * @author WireSegal * Created at 5:00 PM on 9/26/19. diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/ShibaModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/ShibaModule.java index f680969239..03944889a2 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/module/ShibaModule.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/module/ShibaModule.java @@ -1,5 +1,17 @@ package org.violetmoon.quark.content.mobs.module; +import com.google.common.collect.ImmutableSet; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.core.Registry; +import net.minecraft.tags.BiomeTags; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.entity.SpawnPlacements.Type; +import net.minecraft.world.entity.animal.Animal; +import net.minecraft.world.entity.animal.Wolf; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.levelgen.Heightmap.Types; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.CompoundBiomeConfig; @@ -18,19 +30,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import com.google.common.collect.ImmutableSet; -import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.core.Registry; -import net.minecraft.tags.BiomeTags; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.entity.SpawnPlacements.Type; -import net.minecraft.world.entity.animal.Animal; -import net.minecraft.world.entity.animal.Wolf; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.levelgen.Heightmap.Types; - @ZetaLoadModule(category = "mobs") public class ShibaModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/StonelingsModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/StonelingsModule.java index bbfb90a9a8..9ed8e882b2 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/module/StonelingsModule.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/module/StonelingsModule.java @@ -1,5 +1,15 @@ package org.violetmoon.quark.content.mobs.module; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.core.Registry; +import net.minecraft.tags.BiomeTags; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.entity.SpawnPlacements.Type; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.levelgen.Heightmap.Types; +import net.minecraftforge.common.Tags; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.CompoundBiomeConfig; @@ -20,17 +30,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.core.Registry; -import net.minecraft.tags.BiomeTags; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.entity.SpawnPlacements.Type; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.levelgen.Heightmap.Types; -import net.minecraftforge.common.Tags; - @ZetaLoadModule(category = "mobs") public class StonelingsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/ToretoiseModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/ToretoiseModule.java index 030aa85639..a24020b4de 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/module/ToretoiseModule.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/module/ToretoiseModule.java @@ -9,9 +9,6 @@ import net.minecraft.world.entity.SpawnPlacements.Type; import net.minecraft.world.level.levelgen.Heightmap.Types; import net.minecraftforge.common.Tags; - -import java.util.List; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.CompoundBiomeConfig; @@ -29,6 +26,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.List; + @ZetaLoadModule(category = "mobs") public class ToretoiseModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/WraithModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/WraithModule.java index f2d29cf327..dcc05414da 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/module/WraithModule.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/module/WraithModule.java @@ -15,10 +15,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.levelgen.Heightmap.Types; import net.minecraft.world.level.levelgen.structure.Structure; - -import java.util.List; -import java.util.stream.Collectors; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.CompoundBiomeConfig; @@ -42,6 +38,9 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.List; +import java.util.stream.Collectors; + @ZetaLoadModule(category = "mobs") public class WraithModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/ai/RunAwayFromPikesGoal.java b/src/main/java/org/violetmoon/quark/content/tools/ai/RunAwayFromPikesGoal.java index a73ba6e5d8..2b2e5f66d7 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/ai/RunAwayFromPikesGoal.java +++ b/src/main/java/org/violetmoon/quark/content/tools/ai/RunAwayFromPikesGoal.java @@ -9,11 +9,9 @@ import net.minecraft.world.level.pathfinder.Path; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; - -import javax.annotation.Nullable; - import org.violetmoon.quark.content.tools.entity.SkullPike; +import javax.annotation.Nullable; import java.util.EnumSet; import java.util.List; diff --git a/src/main/java/org/violetmoon/quark/content/tools/block/CloudBlock.java b/src/main/java/org/violetmoon/quark/content/tools/block/CloudBlock.java index 44def85483..834d3eb9d9 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/block/CloudBlock.java +++ b/src/main/java/org/violetmoon/quark/content/tools/block/CloudBlock.java @@ -23,16 +23,14 @@ import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.content.tools.block.be.CloudBlockEntity; import org.violetmoon.quark.content.tools.module.BottledCloudModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + public class CloudBlock extends QuarkBlock implements EntityBlock { public CloudBlock(ZetaModule module) { diff --git a/src/main/java/org/violetmoon/quark/content/tools/block/be/CloudBlockEntity.java b/src/main/java/org/violetmoon/quark/content/tools/block/be/CloudBlockEntity.java index 620db4a449..610c847224 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/block/be/CloudBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/content/tools/block/be/CloudBlockEntity.java @@ -1,8 +1,5 @@ package org.violetmoon.quark.content.tools.block.be; -import org.violetmoon.quark.content.tools.module.BottledCloudModule; -import org.violetmoon.zeta.block.be.ZetaBlockEntity; - import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; @@ -11,6 +8,8 @@ import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.content.tools.module.BottledCloudModule; +import org.violetmoon.zeta.block.be.ZetaBlockEntity; public class CloudBlockEntity extends ZetaBlockEntity { diff --git a/src/main/java/org/violetmoon/quark/content/tools/client/render/GlintRenderTypes.java b/src/main/java/org/violetmoon/quark/content/tools/client/render/GlintRenderTypes.java index e555ebe23e..311b4fa8c6 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/client/render/GlintRenderTypes.java +++ b/src/main/java/org/violetmoon/quark/content/tools/client/render/GlintRenderTypes.java @@ -10,14 +10,13 @@ import net.minecraft.world.item.DyeColor; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.content.tools.module.ColorRunesModule; import java.util.ArrayList; import java.util.List; import java.util.function.Function; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.content.tools.module.ColorRunesModule; - @OnlyIn(Dist.CLIENT) public class GlintRenderTypes extends RenderType { private GlintRenderTypes(String name, VertexFormat vf, VertexFormat.Mode mode, int bufSize, boolean affectsCrumbling, boolean sortOnUpload, Runnable setup, Runnable clean) { diff --git a/src/main/java/org/violetmoon/quark/content/tools/client/render/QuarkBeaconBlockEntityRenderer.java b/src/main/java/org/violetmoon/quark/content/tools/client/render/QuarkBeaconBlockEntityRenderer.java index a1e6e3726c..2e7844f52d 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/client/render/QuarkBeaconBlockEntityRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/tools/client/render/QuarkBeaconBlockEntityRenderer.java @@ -1,16 +1,10 @@ package org.violetmoon.quark.content.tools.client.render; -import java.util.List; - -import org.violetmoon.quark.content.tools.module.BeaconRedirectionModule; -import org.violetmoon.quark.content.tools.module.BeaconRedirectionModule.ExtendedBeamSegment; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Matrix3f; import com.mojang.math.Matrix4f; import com.mojang.math.Vector3f; - import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BeaconRenderer; @@ -18,6 +12,10 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.level.block.entity.BeaconBlockEntity; +import org.violetmoon.quark.content.tools.module.BeaconRedirectionModule; +import org.violetmoon.quark.content.tools.module.BeaconRedirectionModule.ExtendedBeamSegment; + +import java.util.List; // Mostly vanilla copypaste but adapted to use ExtendedBeamSegment values public class QuarkBeaconBlockEntityRenderer { diff --git a/src/main/java/org/violetmoon/quark/content/tools/client/render/be/CloudRenderer.java b/src/main/java/org/violetmoon/quark/content/tools/client/render/be/CloudRenderer.java index 9fe15ce603..68cebe22ac 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/client/render/be/CloudRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/tools/client/render/be/CloudRenderer.java @@ -1,7 +1,6 @@ package org.violetmoon.quark.content.tools.client.render.be; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType; @@ -10,12 +9,11 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Blocks; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.QuarkClient; import org.violetmoon.quark.content.tools.block.be.CloudBlockEntity; +import javax.annotation.Nonnull; + public class CloudRenderer implements BlockEntityRenderer { public CloudRenderer(BlockEntityRendererProvider.Context context) { diff --git a/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/PickarangRenderer.java b/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/PickarangRenderer.java index def65d8972..eda028c153 100755 --- a/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/PickarangRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/PickarangRenderer.java @@ -1,12 +1,7 @@ package org.violetmoon.quark.content.tools.client.render.entity; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.tools.entity.rang.AbstractPickarang; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType; @@ -15,6 +10,9 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.quark.content.tools.entity.rang.AbstractPickarang; + +import javax.annotation.Nonnull; public class PickarangRenderer extends EntityRenderer> { diff --git a/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/SkullPikeRenderer.java b/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/SkullPikeRenderer.java index fe922372e1..151981a804 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/SkullPikeRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/SkullPikeRenderer.java @@ -6,11 +6,10 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.quark.content.tools.entity.SkullPike; import javax.annotation.Nonnull; -import org.violetmoon.quark.content.tools.entity.SkullPike; - public class SkullPikeRenderer extends EntityRenderer { public SkullPikeRenderer(EntityRendererProvider.Context context) { diff --git a/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/TorchArrowRenderer.java b/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/TorchArrowRenderer.java index d95f571177..f41d39da84 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/TorchArrowRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/TorchArrowRenderer.java @@ -1,11 +1,10 @@ package org.violetmoon.quark.content.tools.client.render.entity; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.content.tools.entity.TorchArrow; - import net.minecraft.client.renderer.entity.ArrowRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.content.tools.entity.TorchArrow; public class TorchArrowRenderer extends ArrowRenderer { diff --git a/src/main/java/org/violetmoon/quark/content/tools/client/tooltip/SeedPouchClientTooltipComponent.java b/src/main/java/org/violetmoon/quark/content/tools/client/tooltip/SeedPouchClientTooltipComponent.java index e541e6030c..c19a49b971 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/client/tooltip/SeedPouchClientTooltipComponent.java +++ b/src/main/java/org/violetmoon/quark/content/tools/client/tooltip/SeedPouchClientTooltipComponent.java @@ -1,17 +1,15 @@ package org.violetmoon.quark.content.tools.client.tooltip; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import org.apache.commons.lang3.tuple.Pair; -import org.violetmoon.quark.content.tools.item.SeedPouchItem; - import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.world.item.ItemStack; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import org.apache.commons.lang3.tuple.Pair; +import org.violetmoon.quark.content.tools.item.SeedPouchItem; import javax.annotation.Nonnull; diff --git a/src/main/java/org/violetmoon/quark/content/tools/config/PickarangType.java b/src/main/java/org/violetmoon/quark/content/tools/config/PickarangType.java index 7e88c6c18d..9ad064cb4a 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/config/PickarangType.java +++ b/src/main/java/org/violetmoon/quark/content/tools/config/PickarangType.java @@ -1,13 +1,12 @@ package org.violetmoon.quark.content.tools.config; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.config.type.IConfigType; -import org.violetmoon.quark.content.tools.entity.rang.AbstractPickarang; - import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.config.type.IConfigType; +import org.violetmoon.quark.content.tools.entity.rang.AbstractPickarang; public class PickarangType> implements IConfigType { diff --git a/src/main/java/org/violetmoon/quark/content/tools/entity/ParrotEgg.java b/src/main/java/org/violetmoon/quark/content/tools/entity/ParrotEgg.java index eadf6e20f9..c0686a046a 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/entity/ParrotEgg.java +++ b/src/main/java/org/violetmoon/quark/content/tools/entity/ParrotEgg.java @@ -18,11 +18,10 @@ import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.content.tools.module.ParrotEggsModule; import javax.annotation.Nonnull; -import org.violetmoon.quark.content.tools.module.ParrotEggsModule; - public class ParrotEgg extends ThrowableItemProjectile { public static final int VARIANTS = 5; diff --git a/src/main/java/org/violetmoon/quark/content/tools/entity/SkullPike.java b/src/main/java/org/violetmoon/quark/content/tools/entity/SkullPike.java index 49dbf88dda..3e5cc00aa9 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/entity/SkullPike.java +++ b/src/main/java/org/violetmoon/quark/content/tools/entity/SkullPike.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.content.tools.entity; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.tools.module.SkullPikesModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; @@ -18,6 +14,9 @@ import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraftforge.network.NetworkHooks; +import org.violetmoon.quark.content.tools.module.SkullPikesModule; + +import javax.annotation.Nonnull; public class SkullPike extends Entity { diff --git a/src/main/java/org/violetmoon/quark/content/tools/entity/TorchArrow.java b/src/main/java/org/violetmoon/quark/content/tools/entity/TorchArrow.java index 90fdba292c..4c540dbcec 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/entity/TorchArrow.java +++ b/src/main/java/org/violetmoon/quark/content/tools/entity/TorchArrow.java @@ -1,8 +1,5 @@ package org.violetmoon.quark.content.tools.entity; -import org.violetmoon.quark.content.tools.module.TorchArrowModule; -import org.violetmoon.quark.integration.claim.IClaimIntegration; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; @@ -19,6 +16,8 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.content.tools.module.TorchArrowModule; +import org.violetmoon.quark.integration.claim.IClaimIntegration; public class TorchArrow extends AbstractArrow { diff --git a/src/main/java/org/violetmoon/quark/content/tools/entity/rang/AbstractPickarang.java b/src/main/java/org/violetmoon/quark/content/tools/entity/rang/AbstractPickarang.java index 7516b20489..8332a7157f 100755 --- a/src/main/java/org/violetmoon/quark/content/tools/entity/rang/AbstractPickarang.java +++ b/src/main/java/org/violetmoon/quark/content/tools/entity/rang/AbstractPickarang.java @@ -48,16 +48,14 @@ import net.minecraftforge.common.ForgeMod; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.network.NetworkHooks; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.content.mobs.entity.Toretoise; import org.violetmoon.quark.content.tools.config.PickarangType; import org.violetmoon.quark.content.tools.module.PickarangModule; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; import java.util.UUID; diff --git a/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Echorang.java b/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Echorang.java index eca20efcea..0145d524d0 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Echorang.java +++ b/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Echorang.java @@ -20,17 +20,15 @@ import net.minecraft.world.level.gameevent.vibrations.VibrationListener; import net.minecraft.world.level.gameevent.vibrations.VibrationListener.VibrationListenerConfig; import net.minecraft.world.phys.Vec3; - -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.tools.config.PickarangType; import org.violetmoon.quark.content.tools.module.PickarangModule; -import static org.violetmoon.quark.content.tools.module.PickarangModule.echorangBreaksAnywayTag; - +import javax.annotation.Nullable; import java.util.function.BiConsumer; +import static org.violetmoon.quark.content.tools.module.PickarangModule.echorangBreaksAnywayTag; + public class Echorang extends AbstractPickarang implements VibrationListenerConfig { private final DynamicGameEventListener dynamicGameEventListener; diff --git a/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Flamerang.java b/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Flamerang.java index 6ff09b7a80..8fd436fc7b 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Flamerang.java +++ b/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Flamerang.java @@ -1,13 +1,12 @@ package org.violetmoon.quark.content.tools.entity.rang; -import org.violetmoon.quark.content.tools.config.PickarangType; -import org.violetmoon.quark.content.tools.module.PickarangModule; - import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.content.tools.config.PickarangType; +import org.violetmoon.quark.content.tools.module.PickarangModule; public class Flamerang extends AbstractPickarang { diff --git a/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Pickarang.java b/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Pickarang.java index 833829df06..ef85054d48 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Pickarang.java +++ b/src/main/java/org/violetmoon/quark/content/tools/entity/rang/Pickarang.java @@ -1,11 +1,10 @@ package org.violetmoon.quark.content.tools.entity.rang; -import org.violetmoon.quark.content.tools.config.PickarangType; -import org.violetmoon.quark.content.tools.module.PickarangModule; - import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.Level; +import org.violetmoon.quark.content.tools.config.PickarangType; +import org.violetmoon.quark.content.tools.module.PickarangModule; public class Pickarang extends AbstractPickarang { diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java index 2a1bf7db10..80577140d2 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java @@ -13,13 +13,12 @@ import net.minecraft.world.level.Level; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.item.QuarkItem; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.ItemNBTHelper; +import javax.annotation.Nonnull; + public class AbacusItem extends QuarkItem { public static final String TAG_POS_X = "boundPosX"; diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/AncientTomeItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/AncientTomeItem.java index a2f73f6aee..e5f72eed7f 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/AncientTomeItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/AncientTomeItem.java @@ -10,14 +10,12 @@ import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.item.QuarkItem; import org.violetmoon.quark.content.experimental.module.EnchantmentsBegoneModule; import org.violetmoon.quark.content.tools.module.AncientTomesModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.List; public class AncientTomeItem extends QuarkItem { diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/BottledCloudItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/BottledCloudItem.java index 9ba9ee077d..f6855a72f0 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/BottledCloudItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/BottledCloudItem.java @@ -11,19 +11,18 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.ClipContext.Block; import net.minecraft.world.level.ClipContext.Fluid; -import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.level.Level; +import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.handler.RayTraceHandler; import org.violetmoon.quark.base.item.QuarkItem; import org.violetmoon.quark.content.tools.module.BottledCloudModule; import org.violetmoon.quark.integration.claim.IClaimIntegration; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; + public class BottledCloudItem extends QuarkItem { public BottledCloudItem(ZetaModule module) { diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/ParrotEggItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/ParrotEggItem.java index 0155b1fd22..ad42d07c3e 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/ParrotEggItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/ParrotEggItem.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.tools.item; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.item.QuarkItem; -import org.violetmoon.quark.content.tools.entity.ParrotEgg; -import org.violetmoon.quark.content.tools.module.ParrotEggsModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -18,6 +11,12 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import org.violetmoon.quark.base.item.QuarkItem; +import org.violetmoon.quark.content.tools.entity.ParrotEgg; +import org.violetmoon.quark.content.tools.module.ParrotEggsModule; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class ParrotEggItem extends QuarkItem { private final int variant; diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/PathfindersQuillItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/PathfindersQuillItem.java index 2d4c6c739c..15b02eb95f 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/PathfindersQuillItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/PathfindersQuillItem.java @@ -1,31 +1,7 @@ package org.violetmoon.quark.content.tools.item; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.QuarkClient; -import org.violetmoon.quark.base.item.QuarkItem; -import org.violetmoon.quark.content.mobs.module.StonelingsModule; -import org.violetmoon.quark.content.tools.module.PathfinderMapsModule; -import org.violetmoon.quark.content.tools.module.PathfinderMapsModule.TradeInfo; -import org.violetmoon.quark.content.world.module.GlimmeringWealdModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.ItemNBTHelper; - import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.GlobalPos; -import net.minecraft.core.Holder; -import net.minecraft.core.NonNullList; -import net.minecraft.core.QuartPos; +import net.minecraft.core.*; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; @@ -39,11 +15,7 @@ import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.MapItem; -import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeSource; @@ -53,6 +25,23 @@ import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.QuarkClient; +import org.violetmoon.quark.base.item.QuarkItem; +import org.violetmoon.quark.content.mobs.module.StonelingsModule; +import org.violetmoon.quark.content.tools.module.PathfinderMapsModule; +import org.violetmoon.quark.content.tools.module.PathfinderMapsModule.TradeInfo; +import org.violetmoon.quark.content.world.module.GlimmeringWealdModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; public class PathfindersQuillItem extends QuarkItem { diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/PickarangItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/PickarangItem.java index 4463ce2ead..cae7c44cf7 100755 --- a/src/main/java/org/violetmoon/quark/content/tools/item/PickarangItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/PickarangItem.java @@ -24,9 +24,6 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.base.item.QuarkItem; @@ -35,6 +32,7 @@ import org.violetmoon.quark.content.tools.module.PickarangModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/RuneItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/RuneItem.java index ced1f57b3c..dbc42218da 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/RuneItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/RuneItem.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.content.tools.item; -import javax.annotation.Nonnull; - +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import org.violetmoon.quark.api.IRuneColorProvider; import org.violetmoon.quark.base.item.QuarkItem; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; +import javax.annotation.Nonnull; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/SlimeInABucketItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/SlimeInABucketItem.java index cfeb7151b7..3c4018ca56 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/SlimeInABucketItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/SlimeInABucketItem.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.tools.item; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.item.QuarkItem; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.ItemNBTHelper; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -31,6 +25,11 @@ import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.base.item.QuarkItem; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; public class SlimeInABucketItem extends QuarkItem { diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/TrowelItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/TrowelItem.java index 8d344b0a38..efb23c2c54 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/TrowelItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/TrowelItem.java @@ -12,9 +12,6 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.phys.BlockHitResult; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.api.ITrowelable; import org.violetmoon.quark.api.IUsageTickerOverride; import org.violetmoon.quark.base.handler.MiscUtil; @@ -23,6 +20,7 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.ItemNBTHelper; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Random; diff --git a/src/main/java/org/violetmoon/quark/content/tools/loot/EnchantTome.java b/src/main/java/org/violetmoon/quark/content/tools/loot/EnchantTome.java index 9c74550d25..86503eeb95 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/loot/EnchantTome.java +++ b/src/main/java/org/violetmoon/quark/content/tools/loot/EnchantTome.java @@ -10,12 +10,11 @@ import net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction; import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; - -import static org.violetmoon.quark.content.tools.module.AncientTomesModule.validEnchants; +import org.violetmoon.quark.content.tools.module.AncientTomesModule; import javax.annotation.Nonnull; -import org.violetmoon.quark.content.tools.module.AncientTomesModule; +import static org.violetmoon.quark.content.tools.module.AncientTomesModule.validEnchants; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/tools/loot/InBiomeCondition.java b/src/main/java/org/violetmoon/quark/content/tools/loot/InBiomeCondition.java index 6eec132860..35b86dacc8 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/loot/InBiomeCondition.java +++ b/src/main/java/org/violetmoon/quark/content/tools/loot/InBiomeCondition.java @@ -1,13 +1,8 @@ package org.violetmoon.quark.content.tools.loot; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.tools.module.PathfinderMapsModule; - import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; - import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; @@ -17,6 +12,9 @@ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.content.tools.module.PathfinderMapsModule; + +import javax.annotation.Nonnull; public record InBiomeCondition(ResourceLocation target) implements LootItemCondition { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java index 5efd24205e..413c52f0c4 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java @@ -1,25 +1,9 @@ package org.violetmoon.quark.content.tools.module; -import java.util.List; - -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.config.type.inputtable.RGBAColorConfig; -import org.violetmoon.quark.content.tools.item.AbacusItem; -import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.client.event.play.ZHighlightBlock; -import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Matrix4f; - import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderType; @@ -36,6 +20,20 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.config.type.inputtable.RGBAColorConfig; +import org.violetmoon.quark.content.tools.item.AbacusItem; +import org.violetmoon.zeta.client.event.load.ZClientSetup; +import org.violetmoon.zeta.client.event.play.ZHighlightBlock; +import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; + +import java.util.List; @ZetaLoadModule(category = "tools") public class AbacusModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/AmbientDiscsModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/AmbientDiscsModule.java index e1cf344293..9b8a0fbcc9 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/AmbientDiscsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/AmbientDiscsModule.java @@ -1,19 +1,5 @@ package org.violetmoon.quark.content.tools.module; -import java.util.ArrayList; -import java.util.List; - -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.handler.QuarkSounds; -import org.violetmoon.quark.base.item.QuarkMusicDiscItem; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.event.play.entity.living.ZLivingDeath; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.resources.sounds.SoundInstance; @@ -25,6 +11,19 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.JukeboxBlockEntity; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.handler.QuarkSounds; +import org.violetmoon.quark.base.item.QuarkMusicDiscItem; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.event.play.entity.living.ZLivingDeath; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; + +import java.util.ArrayList; +import java.util.List; @ZetaLoadModule(category = "tools") public class AmbientDiscsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java index 28c89c41d3..c57106c95b 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java @@ -4,7 +4,6 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import net.minecraft.core.Direction; import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -33,14 +32,6 @@ import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.common.util.LazyOptional; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.api.IRuneColorProvider; import org.violetmoon.quark.api.QuarkCapabilities; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; @@ -50,7 +41,6 @@ import org.violetmoon.quark.content.tools.item.AncientTomeItem; import org.violetmoon.quark.content.tools.loot.EnchantTome; import org.violetmoon.quark.content.world.module.MonsterBoxModule; -import org.violetmoon.zeta.event.*; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.load.ZCommonSetup; @@ -66,6 +56,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/BeaconRedirectionModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/BeaconRedirectionModule.java index cca4266d26..74ab06ef3e 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/BeaconRedirectionModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/BeaconRedirectionModule.java @@ -19,11 +19,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.phys.AABB; - -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; @@ -39,6 +34,10 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; + @ZetaLoadModule(category = "tools") public class BeaconRedirectionModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/BottledCloudModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/BottledCloudModule.java index 12a7a587f8..58e5baad38 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/BottledCloudModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/BottledCloudModule.java @@ -1,5 +1,14 @@ package org.violetmoon.quark.content.tools.module; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; +import net.minecraft.core.Registry; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntityType; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.tools.block.CloudBlock; @@ -15,16 +24,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; -import net.minecraft.core.Registry; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; - @ZetaLoadModule(category = "tools") public class BottledCloudModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/ColorRunesModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/ColorRunesModule.java index 937bb5deff..23f0b0f529 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/ColorRunesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/ColorRunesModule.java @@ -27,7 +27,6 @@ import org.violetmoon.quark.base.network.message.UpdateTridentMessage; import org.violetmoon.quark.content.tools.client.render.GlintRenderTypes; import org.violetmoon.quark.content.tools.item.RuneItem; -import org.violetmoon.zeta.event.*; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.load.ZCommonSetup; diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/EndermoshMusicDiscModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/EndermoshMusicDiscModule.java index 1217fe61ae..de4165be69 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/EndermoshMusicDiscModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/EndermoshMusicDiscModule.java @@ -1,5 +1,12 @@ package org.violetmoon.quark.content.tools.module; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.sounds.SimpleSoundInstance; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.dimension.LevelStem; +import net.minecraft.world.level.storage.loot.BuiltInLootTables; +import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.base.item.QuarkMusicDiscItem; @@ -12,14 +19,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.sounds.SimpleSoundInstance; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.dimension.LevelStem; -import net.minecraft.world.level.storage.loot.BuiltInLootTables; -import net.minecraft.world.level.storage.loot.entries.LootItem; -import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; - @ZetaLoadModule(category = "tools") public class EndermoshMusicDiscModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/ParrotEggsModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/ParrotEggsModule.java index 59e102603d..e9ed63b69e 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/ParrotEggsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/ParrotEggsModule.java @@ -25,10 +25,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.DispenserBlock; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.QuarkSounds; @@ -37,7 +33,6 @@ import org.violetmoon.quark.content.tools.entity.ParrotEgg; import org.violetmoon.quark.content.tools.item.ParrotEggItem; import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.event.*; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.load.ZCommonSetup; @@ -49,6 +44,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/PathfinderMapsModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/PathfinderMapsModule.java index d0ab4753e5..282381bdf3 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/PathfinderMapsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/PathfinderMapsModule.java @@ -1,38 +1,7 @@ package org.violetmoon.quark.content.tools.module; -import java.util.LinkedList; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.QuarkClient; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.config.type.IConfigType; -import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; -import org.violetmoon.quark.base.handler.advancement.QuarkGenericTrigger; -import org.violetmoon.quark.content.tools.item.PathfindersQuillItem; -import org.violetmoon.quark.content.tools.loot.InBiomeCondition; -import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers; -import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZConfigChanged; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; -import org.violetmoon.zeta.event.play.loading.ZVillagerTrades; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; -import org.violetmoon.zeta.util.ItemNBTHelper; - import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.vertex.PoseStack; - import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.Minecraft; import net.minecraft.client.color.item.ItemColor; @@ -62,10 +31,36 @@ import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.village.WandererTradesEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.QuarkClient; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.config.type.IConfigType; +import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; +import org.violetmoon.quark.base.handler.advancement.QuarkGenericTrigger; +import org.violetmoon.quark.content.tools.item.PathfindersQuillItem; +import org.violetmoon.quark.content.tools.loot.InBiomeCondition; +import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers; +import org.violetmoon.zeta.client.event.load.ZClientSetup; +import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZConfigChanged; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; +import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; +import org.violetmoon.zeta.event.play.loading.ZVillagerTrades; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Collectors; @ZetaLoadModule(category = "tools") public class PathfinderMapsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/PickarangModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/PickarangModule.java index 80175dfa27..9d86b380f5 100755 --- a/src/main/java/org/violetmoon/quark/content/tools/module/PickarangModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/PickarangModule.java @@ -16,11 +16,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.gameevent.GameEvent; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.BooleanSupplier; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; @@ -41,6 +36,10 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.ArrayList; +import java.util.List; +import java.util.function.BooleanSupplier; + @ZetaLoadModule(category = "tools") public class PickarangModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/SkullPikesModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/SkullPikesModule.java index 0cff40faad..bdf4942329 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/SkullPikesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/SkullPikesModule.java @@ -1,5 +1,20 @@ package org.violetmoon.quark.content.tools.module; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.entity.monster.Monster; +import net.minecraft.world.entity.monster.PatrollingMonster; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.MiscUtil; @@ -17,22 +32,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.entity.monster.Monster; -import net.minecraft.world.entity.monster.PatrollingMonster; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; - @ZetaLoadModule(category = "tools") public class SkullPikesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/SlimeInABucketModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/SlimeInABucketModule.java index 80c8258a07..1c9b609d12 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/SlimeInABucketModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/SlimeInABucketModule.java @@ -1,16 +1,5 @@ package org.violetmoon.quark.content.tools.module; -import org.violetmoon.quark.content.tools.item.SlimeInABucketItem; -import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerInteract; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; -import org.violetmoon.zeta.util.ItemNBTHelper; - import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -23,6 +12,16 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.gameevent.GameEvent; +import org.violetmoon.quark.content.tools.item.SlimeInABucketItem; +import org.violetmoon.zeta.client.event.load.ZClientSetup; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.event.play.entity.player.ZPlayerInteract; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; +import org.violetmoon.zeta.util.ItemNBTHelper; @ZetaLoadModule(category = "tools") public class SlimeInABucketModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/TorchArrowModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/TorchArrowModule.java index fcf7254b36..a90b6f968a 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/TorchArrowModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/TorchArrowModule.java @@ -1,5 +1,13 @@ package org.violetmoon.quark.content.tools.module; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.item.Item; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.item.QuarkArrowItem; @@ -12,15 +20,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.item.Item; - @ZetaLoadModule(category = "tools") public class TorchArrowModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/TrowelModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/TrowelModule.java index c3f90ae65e..e668d0c28c 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/TrowelModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/TrowelModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.tools.module; +import net.minecraft.world.item.Item; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.tools.item.TrowelItem; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -8,8 +9,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.world.item.Item; - @ZetaLoadModule(category = "tools") public class TrowelModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/ai/NuzzleGoal.java b/src/main/java/org/violetmoon/quark/content/tweaks/ai/NuzzleGoal.java index 4ad5aa9c7e..d8bb534711 100755 --- a/src/main/java/org/violetmoon/quark/content/tweaks/ai/NuzzleGoal.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/ai/NuzzleGoal.java @@ -10,8 +10,6 @@ */ package org.violetmoon.quark.content.tweaks.ai; -import java.util.EnumSet; - import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.TamableAnimal; @@ -21,6 +19,8 @@ import net.minecraft.world.entity.ai.navigation.PathNavigation; import net.minecraft.world.level.pathfinder.BlockPathTypes; +import java.util.EnumSet; + public class NuzzleGoal extends Goal { private final TamableAnimal creature; diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/ai/WantLoveGoal.java b/src/main/java/org/violetmoon/quark/content/tweaks/ai/WantLoveGoal.java index c93b596532..81fbc45b16 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/ai/WantLoveGoal.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/ai/WantLoveGoal.java @@ -1,13 +1,12 @@ package org.violetmoon.quark.content.tweaks.ai; -import java.util.EnumSet; - -import org.violetmoon.quark.content.tweaks.module.PatTheDogsModule; - import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.TamableAnimal; import net.minecraft.world.entity.ai.goal.Goal; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.content.tweaks.module.PatTheDogsModule; + +import java.util.EnumSet; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/block/DirtyGlassBlock.java b/src/main/java/org/violetmoon/quark/content/tweaks/block/DirtyGlassBlock.java index 2901692d88..263004a433 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/block/DirtyGlassBlock.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/block/DirtyGlassBlock.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.content.tweaks.block; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.block.QuarkGlassBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.block.QuarkGlassBlock; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nullable; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmote.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmote.java index 50d449d49e..f3ac25a6ef 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmote.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmote.java @@ -1,11 +1,10 @@ package org.violetmoon.quark.content.tweaks.client.emote; -import org.violetmoon.quark.content.tweaks.module.EmotesModule; - import net.minecraft.client.model.HumanoidModel; import net.minecraft.world.entity.player.Player; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.content.tweaks.module.EmotesModule; @OnlyIn(Dist.CLIENT) public class CustomEmote extends TemplateSourcedEmote { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteDescriptor.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteDescriptor.java index 3c852d79ba..58c938be57 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteDescriptor.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteDescriptor.java @@ -1,11 +1,10 @@ package org.violetmoon.quark.content.tweaks.client.emote; -import org.violetmoon.quark.content.tweaks.module.EmotesModule; - import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.PackType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.content.tweaks.module.EmotesModule; @OnlyIn(Dist.CLIENT) public class CustomEmoteDescriptor extends EmoteDescriptor { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteIconResourcePack.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteIconResourcePack.java index 381ee82ef4..1d50dab97d 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteIconResourcePack.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteIconResourcePack.java @@ -1,30 +1,23 @@ package org.violetmoon.quark.content.tweaks.client.emote; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import java.util.function.Predicate; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.content.tweaks.module.EmotesModule; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; - import net.minecraft.ResourceLocationException; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.AbstractPackResources; import net.minecraft.server.packs.PackType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.content.tweaks.module.EmotesModule; + +import javax.annotation.Nonnull; +import java.io.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; +import java.util.function.Predicate; @OnlyIn(Dist.CLIENT) public class CustomEmoteIconResourcePack extends AbstractPackResources { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteTemplate.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteTemplate.java index 8be21f21c5..91fd7a982d 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteTemplate.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteTemplate.java @@ -1,15 +1,14 @@ package org.violetmoon.quark.content.tweaks.client.emote; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.content.tweaks.module.EmotesModule; + import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; -import org.violetmoon.quark.content.tweaks.module.EmotesModule; - -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - @OnlyIn(Dist.CLIENT) public class CustomEmoteTemplate extends EmoteTemplate { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteBase.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteBase.java index 5d8958e8ae..e2b3ece85c 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteBase.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteBase.java @@ -10,10 +10,9 @@ */ package org.violetmoon.quark.content.tweaks.client.emote; -import com.mojang.blaze3d.vertex.PoseStack; - import aurelienribon.tweenengine.Timeline; import aurelienribon.tweenengine.TweenManager; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.model.HumanoidModel; import net.minecraft.world.entity.player.Player; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteSound.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteSound.java index b7d596f6da..53836ae6a2 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteSound.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteSound.java @@ -10,9 +10,6 @@ */ package org.violetmoon.quark.content.tweaks.client.emote; -import java.lang.ref.WeakReference; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.sounds.AbstractSoundInstance; import net.minecraft.client.resources.sounds.SoundInstance; @@ -24,6 +21,9 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import java.lang.ref.WeakReference; +import java.util.List; + @OnlyIn(Dist.CLIENT) public class EmoteSound extends AbstractSoundInstance implements TickableSoundInstance { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteState.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteState.java index 9886ea2667..da432ec4ff 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteState.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteState.java @@ -12,7 +12,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; - import net.minecraft.client.model.HumanoidModel; import net.minecraft.world.entity.player.Player; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteTemplate.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteTemplate.java index 170bcca880..a08f6e3038 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteTemplate.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteTemplate.java @@ -1,13 +1,13 @@ package org.violetmoon.quark.content.tweaks.client.emote; -import com.google.common.collect.Lists; - import aurelienribon.tweenengine.*; +import com.google.common.collect.Lists; import net.minecraft.client.model.HumanoidModel; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.Quark; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -17,8 +17,6 @@ import java.lang.reflect.Modifier; import java.util.*; -import org.violetmoon.quark.base.Quark; - @OnlyIn(Dist.CLIENT) public class EmoteTemplate { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/ModelAccessor.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/ModelAccessor.java index 064bdce56b..0003fd29a3 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/ModelAccessor.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/ModelAccessor.java @@ -10,6 +10,7 @@ */ package org.violetmoon.quark.content.tweaks.client.emote; +import aurelienribon.tweenengine.TweenAccessor; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.model.geom.ModelPart; @@ -19,8 +20,6 @@ import java.util.Map; import java.util.WeakHashMap; -import aurelienribon.tweenengine.TweenAccessor; - @OnlyIn(Dist.CLIENT) public class ModelAccessor implements TweenAccessor> { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/TemplateSourcedEmote.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/TemplateSourcedEmote.java index 7ce7845909..4aa7331874 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/TemplateSourcedEmote.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/TemplateSourcedEmote.java @@ -1,7 +1,5 @@ package org.violetmoon.quark.content.tweaks.client.emote; -import org.violetmoon.quark.base.Quark; - import aurelienribon.tweenengine.Timeline; import cpw.mods.modlauncher.Launcher; import cpw.mods.modlauncher.api.IEnvironment; @@ -9,6 +7,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.Quark; @OnlyIn(Dist.CLIENT) public class TemplateSourcedEmote extends EmoteBase { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/item/ClockTimeGetter.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/item/ClockTimeGetter.java index e43a7f9fc0..a7fa5ab8db 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/item/ClockTimeGetter.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/item/ClockTimeGetter.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.content.tweaks.client.item; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.zeta.util.ItemNBTHelper; - import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.item.ItemPropertyFunction; import net.minecraft.util.Mth; @@ -14,6 +9,10 @@ import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.zeta.util.ItemNBTHelper; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class ClockTimeGetter { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/item/CompassAngleGetter.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/item/CompassAngleGetter.java index e876a9c562..e8374e9033 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/item/CompassAngleGetter.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/item/CompassAngleGetter.java @@ -20,13 +20,11 @@ import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.content.tweaks.module.CompassesWorkEverywhereModule; import org.violetmoon.zeta.util.ItemNBTHelper; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.Optional; public class CompassAngleGetter { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/layer/ArmorStandFakePlayerLayer.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/layer/ArmorStandFakePlayerLayer.java index 4985ed0090..e0951fd8b1 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/layer/ArmorStandFakePlayerLayer.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/layer/ArmorStandFakePlayerLayer.java @@ -26,12 +26,11 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.block.SkullBlock; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.content.client.module.UsesForCursesModule; import org.violetmoon.zeta.util.ItemNBTHelper; +import javax.annotation.Nonnull; + public class ArmorStandFakePlayerLayer> extends RenderLayer { private final PlayerModel playerModel; diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/render/entity/DyedItemFrameRenderer.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/render/entity/DyedItemFrameRenderer.java index 6d06dba290..69e7565a66 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/render/entity/DyedItemFrameRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/render/entity/DyedItemFrameRenderer.java @@ -1,11 +1,7 @@ package org.violetmoon.quark.content.tweaks.client.render.entity; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.content.tweaks.entity.DyedItemFrame; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.Sheets; @@ -29,6 +25,8 @@ import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.content.tweaks.entity.DyedItemFrame; // yes this shit again @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/screen/widgets/EmoteButton.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/screen/widgets/EmoteButton.java index 6de4ed083b..5a2cd01731 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/screen/widgets/EmoteButton.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/screen/widgets/EmoteButton.java @@ -1,18 +1,16 @@ package org.violetmoon.quark.content.tweaks.client.screen.widgets; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.content.tweaks.client.emote.EmoteDescriptor; -import org.violetmoon.quark.content.tweaks.module.EmotesModule; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.content.tweaks.client.emote.EmoteDescriptor; +import org.violetmoon.quark.content.tweaks.module.EmotesModule; + +import javax.annotation.Nonnull; public class EmoteButton extends TranslucentButton { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/screen/widgets/TranslucentButton.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/screen/widgets/TranslucentButton.java index 2d05831698..29058cea2a 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/screen/widgets/TranslucentButton.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/screen/widgets/TranslucentButton.java @@ -1,7 +1,6 @@ package org.violetmoon.quark.content.tweaks.client.screen.widgets; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/entity/DyedItemFrame.java b/src/main/java/org/violetmoon/quark/content/tweaks/entity/DyedItemFrame.java index f81933e566..8feca630b0 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/entity/DyedItemFrame.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/entity/DyedItemFrame.java @@ -1,8 +1,5 @@ package org.violetmoon.quark.content.tweaks.entity; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.content.tweaks.module.DyeableItemFramesModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -16,6 +13,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.content.tweaks.module.DyeableItemFramesModule; public class DyedItemFrame extends ItemFrame { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/ArmedArmorStandsModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/ArmedArmorStandsModule.java index 0a33fca530..944c6c761d 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/ArmedArmorStandsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/ArmedArmorStandsModule.java @@ -1,15 +1,14 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.world.entity.decoration.ArmorStand; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.play.entity.ZEntityConstruct; import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.world.entity.decoration.ArmorStand; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; - /** * @author WireSegal * Created at 8:40 AM on 8/27/19. diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/AutomaticRecipeUnlockModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/AutomaticRecipeUnlockModule.java index 24c1c26657..9202acd323 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/AutomaticRecipeUnlockModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/AutomaticRecipeUnlockModule.java @@ -17,9 +17,6 @@ import net.minecraft.world.inventory.RecipeBookType; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.level.GameRules; - -import java.util.*; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.client.event.play.ZEndClientTick; @@ -31,6 +28,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.*; + @ZetaLoadModule(category = "tweaks") public class AutomaticRecipeUnlockModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/BetterElytraRocketModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/BetterElytraRocketModule.java index 8e2784ea2d..f419fb2f8c 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/BetterElytraRocketModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/BetterElytraRocketModule.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickItem; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Player; @@ -12,6 +7,10 @@ import net.minecraft.world.item.FireworkRocketItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickItem; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; @ZetaLoadModule(category = "tweaks") public class BetterElytraRocketModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/CampfiresBoostElytraModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/CampfiresBoostElytraModule.java index 25699f240a..16c4ef6a15 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/CampfiresBoostElytraModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/CampfiresBoostElytraModule.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; import net.minecraft.world.entity.player.Player; @@ -18,6 +11,12 @@ import net.minecraft.world.level.block.CampfireBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; @ZetaLoadModule(category = "tweaks") public class CampfiresBoostElytraModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/CompassesWorkEverywhereModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/CompassesWorkEverywhereModule.java index d6ff05d107..73615ef5b7 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/CompassesWorkEverywhereModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/CompassesWorkEverywhereModule.java @@ -1,5 +1,13 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.client.renderer.item.ItemProperties; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.content.tweaks.client.item.ClockTimeGetter; import org.violetmoon.quark.content.tweaks.client.item.CompassAngleGetter; @@ -12,15 +20,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.renderer.item.ItemProperties; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; - @ZetaLoadModule(category = "tweaks") public class CompassesWorkEverywhereModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/CoralOnCactusModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/CoralOnCactusModule.java index 8de6442ff5..e54029e320 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/CoralOnCactusModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/CoralOnCactusModule.java @@ -1,15 +1,14 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZConfigChanged; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.CoralFanBlock; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZConfigChanged; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; @ZetaLoadModule(category = "tweaks") public class CoralOnCactusModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/DiamondRepairModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/DiamondRepairModule.java index 51fc576b0f..ee727b935b 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/DiamondRepairModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/DiamondRepairModule.java @@ -8,11 +8,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; - -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; @@ -22,6 +17,10 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.RegistryUtil; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + @ZetaLoadModule(category = "tweaks") public class DiamondRepairModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/DoubleDoorOpeningModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/DoubleDoorOpeningModule.java index db088d486a..b39d3d2d51 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/DoubleDoorOpeningModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/DoubleDoorOpeningModule.java @@ -1,22 +1,7 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.network.QuarkNetwork; -import org.violetmoon.quark.base.network.message.DoubleDoorMessage; -import org.violetmoon.quark.integration.claim.IClaimIntegration; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.bus.ZResult; -import org.violetmoon.zeta.event.load.ZCommonSetup; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; @@ -40,6 +25,19 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.network.QuarkNetwork; +import org.violetmoon.quark.base.network.message.DoubleDoorMessage; +import org.violetmoon.quark.integration.claim.IClaimIntegration; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.bus.ZResult; +import org.violetmoon.zeta.event.load.ZCommonSetup; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; @ZetaLoadModule(category = "tweaks", antiOverlap = "utilitix") public class DoubleDoorOpeningModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/DragonScalesModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/DragonScalesModule.java index b0d547717f..9afd7f557a 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/DragonScalesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/DragonScalesModule.java @@ -1,5 +1,12 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.core.Registry; +import net.minecraft.world.entity.boss.enderdragon.EnderDragon; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.Vec3; import org.violetmoon.quark.base.item.QuarkItem; import org.violetmoon.quark.content.tweaks.recipe.ElytraDuplicationRecipe; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -10,14 +17,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.core.Registry; -import net.minecraft.world.entity.boss.enderdragon.EnderDragon; -import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.phys.Vec3; - @ZetaLoadModule(category = "tweaks") public class DragonScalesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/DyeableItemFramesModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/DyeableItemFramesModule.java index bb895e06b1..5b74f2cb1d 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/DyeableItemFramesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/DyeableItemFramesModule.java @@ -1,21 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import java.util.Arrays; -import java.util.List; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.content.tweaks.client.render.entity.DyedItemFrameRenderer; -import org.violetmoon.quark.content.tweaks.entity.DyedItemFrame; -import org.violetmoon.zeta.client.event.load.ZAddModels; -import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.client.renderer.entity.EntityRenderers; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.core.BlockPos; @@ -36,6 +20,21 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.content.tweaks.client.render.entity.DyedItemFrameRenderer; +import org.violetmoon.quark.content.tweaks.entity.DyedItemFrame; +import org.violetmoon.zeta.client.event.load.ZAddModels; +import org.violetmoon.zeta.client.event.load.ZClientSetup; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; + +import java.util.Arrays; +import java.util.List; @ZetaLoadModule(category = "tweaks") public class DyeableItemFramesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/EmotesModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/EmotesModule.java index cd80ab75f2..5e114a2b33 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/EmotesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/EmotesModule.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.content.tweaks.module; +import aurelienribon.tweenengine.Tween; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; - -import aurelienribon.tweenengine.Tween; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; @@ -20,9 +19,6 @@ import net.minecraft.server.packs.repository.Pack; import net.minecraft.server.packs.repository.RepositorySource; import net.minecraft.world.entity.player.Player; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.QuarkClient; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.ContributorRewardHandler; @@ -31,14 +27,9 @@ import org.violetmoon.quark.content.tweaks.client.emote.*; import org.violetmoon.quark.content.tweaks.client.screen.widgets.EmoteButton; import org.violetmoon.quark.content.tweaks.client.screen.widgets.TranslucentButton; -import org.violetmoon.zeta.client.event.*; import org.violetmoon.zeta.client.event.load.ZClientSetup; import org.violetmoon.zeta.client.event.load.ZKeyMapping; -import org.violetmoon.zeta.client.event.play.ZInput; -import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; -import org.violetmoon.zeta.client.event.play.ZRenderLiving; -import org.violetmoon.zeta.client.event.play.ZRenderTick; -import org.violetmoon.zeta.client.event.play.ZScreen; +import org.violetmoon.zeta.client.event.play.*; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.load.ZConfigChanged; @@ -46,6 +37,7 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import javax.annotation.Nonnull; import java.io.File; import java.util.*; import java.util.function.Consumer; diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java index acefc90694..489af5056e 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java @@ -1,21 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import java.util.List; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.zeta.client.event.play.ZInputUpdate; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZCommonSetup; -import org.violetmoon.zeta.event.load.ZConfigChanged; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; -import org.violetmoon.zeta.event.play.loading.ZGatherHints; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.client.Minecraft; import net.minecraft.client.player.Input; import net.minecraft.core.BlockPos; @@ -47,6 +31,21 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.zeta.client.event.play.ZInputUpdate; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZCommonSetup; +import org.violetmoon.zeta.event.load.ZConfigChanged; +import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; +import org.violetmoon.zeta.event.play.loading.ZGatherHints; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.List; @ZetaLoadModule(category = "tweaks") public class EnhancedLaddersModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/GlassShardModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/GlassShardModule.java index 6dd0674c2a..16a2c76501 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/GlassShardModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/GlassShardModule.java @@ -10,10 +10,6 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; - -import java.util.HashMap; -import java.util.Map; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.block.QuarkInheritedPaneBlock; @@ -25,6 +21,9 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.HashMap; +import java.util.Map; + /** * @author WireSegal * Created at 12:26 PM on 8/24/19. diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/GoldToolsHaveFortuneModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/GoldToolsHaveFortuneModule.java index e94744775b..bb0839428f 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/GoldToolsHaveFortuneModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/GoldToolsHaveFortuneModule.java @@ -13,9 +13,6 @@ import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; - -import java.util.*; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.Config.Max; @@ -26,6 +23,11 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + @ZetaLoadModule(category = "tweaks") public class GoldToolsHaveFortuneModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/GrabChickensModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/GrabChickensModule.java index 4e7a27241d..3497b00a12 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/GrabChickensModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/GrabChickensModule.java @@ -1,16 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import java.util.List; - -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZConfigChanged; -import org.violetmoon.zeta.event.play.entity.ZEntityInteract; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.client.model.ChickenModel; import net.minecraft.network.protocol.game.ClientboundSetPassengersPacket; import net.minecraft.server.level.ServerLevel; @@ -24,6 +13,16 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraftforge.common.util.FakePlayer; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZConfigChanged; +import org.violetmoon.zeta.event.play.entity.ZEntityInteract; +import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; + +import java.util.List; @ZetaLoadModule(category = "tweaks") public class GrabChickensModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/HoeHarvestingModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/HoeHarvestingModule.java index 386ac48eac..eb108fb065 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/HoeHarvestingModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/HoeHarvestingModule.java @@ -1,16 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZCommonSetup; -import org.violetmoon.zeta.event.play.ZBlock; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; @@ -35,6 +24,16 @@ import net.minecraftforge.common.PlantType; import net.minecraftforge.common.Tags; import net.minecraftforge.common.ToolActions; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZCommonSetup; +import org.violetmoon.zeta.event.play.ZBlock; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; @ZetaLoadModule(category = "tweaks") public class HoeHarvestingModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/HorsesSwimModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/HorsesSwimModule.java index b6a5ac1c73..9430b92c4d 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/HorsesSwimModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/HorsesSwimModule.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.world.entity.MoverType; +import net.minecraft.world.entity.animal.horse.AbstractHorse; +import net.minecraft.world.phys.Vec3; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.entity.MoverType; -import net.minecraft.world.entity.animal.horse.AbstractHorse; -import net.minecraft.world.phys.Vec3; - @ZetaLoadModule(category = "tweaks") public class HorsesSwimModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/ImprovedSpongesModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/ImprovedSpongesModule.java index 7d860a751e..42596ec003 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/ImprovedSpongesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/ImprovedSpongesModule.java @@ -1,13 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickItem; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; @@ -20,6 +12,13 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.BlockHitResult; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickItem; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; @ZetaLoadModule(category = "tweaks") public class ImprovedSpongesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/MapWashingModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/MapWashingModule.java index 437e620892..3df39c9e2f 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/MapWashingModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/MapWashingModule.java @@ -1,15 +1,14 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZCommonSetup; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.cauldron.CauldronInteraction; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.LayeredCauldronBlock; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZCommonSetup; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; @ZetaLoadModule(category = "tweaks", antiOverlap = "supplementaries") public class MapWashingModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/MoreBannerLayersModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/MoreBannerLayersModule.java index adf885da4b..6b550553a2 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/MoreBannerLayersModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/MoreBannerLayersModule.java @@ -1,5 +1,8 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZConfigChanged; @@ -7,10 +10,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.tags.ItemTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; - @ZetaLoadModule(category = "tweaks") public class MoreBannerLayersModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/MoreNoteBlockSoundsModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/MoreNoteBlockSoundsModule.java index e19b5c44ea..94711a9316 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/MoreNoteBlockSoundsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/MoreNoteBlockSoundsModule.java @@ -17,10 +17,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; import net.minecraft.world.level.material.Material; - -import java.util.Arrays; -import java.util.List; - import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.MiscUtil; import org.violetmoon.zeta.event.bus.PlayEvent; @@ -29,6 +25,9 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.Arrays; +import java.util.List; + @ZetaLoadModule(category = "tweaks") public class MoreNoteBlockSoundsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/NoDurabilityOnCosmeticsModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/NoDurabilityOnCosmeticsModule.java index 0103f2b2c1..eb827f9c03 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/NoDurabilityOnCosmeticsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/NoDurabilityOnCosmeticsModule.java @@ -1,5 +1,10 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -9,12 +14,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - @ZetaLoadModule(category = "tweaks") public class NoDurabilityOnCosmeticsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/PatTheDogsModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/PatTheDogsModule.java index b5356c0ec0..c9e711aa9c 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/PatTheDogsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/PatTheDogsModule.java @@ -14,9 +14,6 @@ import net.minecraft.world.entity.animal.horse.AbstractHorse; import net.minecraft.world.entity.monster.Strider; import net.minecraft.world.entity.player.Player; - -import java.util.List; - import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.MiscUtil; import org.violetmoon.quark.base.handler.QuarkSounds; @@ -30,6 +27,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.List; + /** * @author WireSegal * Created at 11:25 AM on 9/2/19. diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/PigLittersModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/PigLittersModule.java index ea75930b74..576d4d267f 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/PigLittersModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/PigLittersModule.java @@ -1,15 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.play.entity.ZEntityJoinLevel; -import org.violetmoon.zeta.event.play.entity.living.ZBabyEntitySpawn; -import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -27,6 +17,15 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.Level; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.play.entity.ZEntityJoinLevel; +import org.violetmoon.zeta.event.play.entity.living.ZBabyEntitySpawn; +import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; @ZetaLoadModule(category = "tweaks") public class PigLittersModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/PoisonPotatoUsageModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/PoisonPotatoUsageModule.java index 273afe1851..e3b1f54592 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/PoisonPotatoUsageModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/PoisonPotatoUsageModule.java @@ -1,17 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; -import org.violetmoon.quark.base.handler.advancement.QuarkGenericTrigger; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.event.play.entity.ZEntityInteract; -import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; @@ -25,6 +13,17 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; +import org.violetmoon.quark.base.handler.advancement.QuarkGenericTrigger; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.event.play.entity.ZEntityInteract; +import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; @ZetaLoadModule(category = "tweaks") public class PoisonPotatoUsageModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/RenewableSporeBlossomsModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/RenewableSporeBlossomsModule.java index 54613eec2e..3ae9c3e854 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/RenewableSporeBlossomsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/RenewableSporeBlossomsModule.java @@ -1,5 +1,10 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.bus.ZResult; @@ -8,12 +13,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; - @ZetaLoadModule(category = "tweaks") public class RenewableSporeBlossomsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/ReplaceScaffoldingModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/ReplaceScaffoldingModule.java index f469577b03..c2144855ec 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/ReplaceScaffoldingModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/ReplaceScaffoldingModule.java @@ -1,13 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundSource; @@ -27,6 +19,13 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; @ZetaLoadModule(category = "tweaks") public class ReplaceScaffoldingModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/SaferCreaturesModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/SaferCreaturesModule.java index a97bcb5608..960cd80634 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/SaferCreaturesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/SaferCreaturesModule.java @@ -1,15 +1,14 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.phys.Vec3; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.play.entity.living.ZLivingFall; import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.phys.Vec3; - @ZetaLoadModule(category = "tweaks") public class SaferCreaturesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/ShulkerPackingModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/ShulkerPackingModule.java index b2ea5085fe..8fc39fb6ff 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/ShulkerPackingModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/ShulkerPackingModule.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; -import org.violetmoon.zeta.util.ItemNBTHelper; - import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.sounds.SoundEvents; @@ -26,6 +19,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.Tags; import net.minecraftforge.items.ItemHandlerHelper; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; +import org.violetmoon.zeta.util.ItemNBTHelper; @ZetaLoadModule(category = "tweaks") public class ShulkerPackingModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/SlabsToBlocksModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/SlabsToBlocksModule.java index 8308a294ca..81a3d4adc2 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/SlabsToBlocksModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/SlabsToBlocksModule.java @@ -7,10 +7,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.block.SlabBlock; import net.minecraftforge.eventbus.api.SubscribeEvent; - -import java.util.HashMap; -import java.util.Map; - import org.violetmoon.quark.api.event.RecipeCrawlEvent; import org.violetmoon.quark.content.tweaks.recipe.SlabToBlockRecipe; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -18,6 +14,9 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.HashMap; +import java.util.Map; + @ZetaLoadModule(category = "tweaks") public class SlabsToBlocksModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/SlimesToMagmaCubesModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/SlimesToMagmaCubesModule.java index e6acde2f06..6b336b3db4 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/SlimesToMagmaCubesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/SlimesToMagmaCubesModule.java @@ -1,5 +1,10 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.monster.Slime; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.load.ZConfigChanged; @@ -8,12 +13,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.monster.Slime; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; - @ZetaLoadModule(category = "tweaks") public class SlimesToMagmaCubesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/SnowGolemPlayerHeadsModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/SnowGolemPlayerHeadsModule.java index 20fbe5b429..81cd15a0e6 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/SnowGolemPlayerHeadsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/SnowGolemPlayerHeadsModule.java @@ -1,8 +1,15 @@ package org.violetmoon.quark.content.tweaks.module; -import java.util.Arrays; -import java.util.List; - +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.animal.SnowGolem; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.monster.Witch; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.phys.Vec3; import org.violetmoon.quark.base.handler.advancement.QuarkAdvancementHandler; import org.violetmoon.quark.base.handler.advancement.QuarkGenericTrigger; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -14,16 +21,8 @@ import org.violetmoon.zeta.util.Hint; import org.violetmoon.zeta.util.ItemNBTHelper; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.animal.SnowGolem; -import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.entity.monster.Witch; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.phys.Vec3; +import java.util.Arrays; +import java.util.List; @ZetaLoadModule(category = "tweaks") public class SnowGolemPlayerHeadsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/UtilityRecipesModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/UtilityRecipesModule.java index 01da87cfd2..bc135662d5 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/UtilityRecipesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/UtilityRecipesModule.java @@ -1,5 +1,8 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.ComposterBlock; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; @@ -9,10 +12,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.block.ComposterBlock; - /** * @author WireSegal * Created at 7:34 PM on 9/28/19. diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/VexesDieWithTheirMastersModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/VexesDieWithTheirMastersModule.java index 3a2bded536..40049edb77 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/VexesDieWithTheirMastersModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/VexesDieWithTheirMastersModule.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.Mob; +import net.minecraft.world.entity.monster.Vex; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.entity.Mob; -import net.minecraft.world.entity.monster.Vex; - @ZetaLoadModule(category = "tweaks") public class VexesDieWithTheirMastersModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/VillagersFollowEmeraldsModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/VillagersFollowEmeraldsModule.java index 78c1727ba2..3dd5f7a8e0 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/VillagersFollowEmeraldsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/VillagersFollowEmeraldsModule.java @@ -1,5 +1,10 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.world.entity.ai.goal.TemptGoal; +import net.minecraft.world.entity.npc.Villager; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.Ingredient; import org.violetmoon.quark.base.handler.MiscUtil; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.play.entity.ZEntityJoinLevel; @@ -7,12 +12,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.world.entity.ai.goal.TemptGoal; -import net.minecraft.world.entity.npc.Villager; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.Ingredient; - /** * @author WireSegal * Created at 11:25 AM on 9/2/19. diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/ZombieVillagersOnNormalModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/ZombieVillagersOnNormalModule.java index 6ad3781993..35729e6302 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/ZombieVillagersOnNormalModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/ZombieVillagersOnNormalModule.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.content.tweaks.module; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.play.entity.living.ZLivingConversion; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.nbt.NbtOps; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobSpawnType; @@ -15,6 +10,10 @@ import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.block.LevelEvent; import net.minecraftforge.event.ForgeEventFactory; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.play.entity.living.ZLivingConversion; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; @ZetaLoadModule(category = "tweaks") public class ZombieVillagersOnNormalModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/recipe/ElytraDuplicationRecipe.java b/src/main/java/org/violetmoon/quark/content/tweaks/recipe/ElytraDuplicationRecipe.java index a76df93778..777c148557 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/recipe/ElytraDuplicationRecipe.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/recipe/ElytraDuplicationRecipe.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.content.tweaks.recipe; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.content.tweaks.module.DragonScalesModule; - import net.minecraft.core.NonNullList; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.CraftingContainer; @@ -15,6 +11,9 @@ import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.SimpleRecipeSerializer; import net.minecraft.world.level.Level; +import org.violetmoon.quark.content.tweaks.module.DragonScalesModule; + +import javax.annotation.Nonnull; public class ElytraDuplicationRecipe extends CustomRecipe { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/recipe/SlabToBlockRecipe.java b/src/main/java/org/violetmoon/quark/content/tweaks/recipe/SlabToBlockRecipe.java index 0beebb1214..a9e00fa222 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/recipe/SlabToBlockRecipe.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/recipe/SlabToBlockRecipe.java @@ -1,20 +1,15 @@ package org.violetmoon.quark.content.tweaks.recipe; -import java.util.Optional; - -import org.violetmoon.quark.content.tweaks.module.SlabsToBlocksModule; - import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.CraftingRecipe; -import net.minecraft.world.item.crafting.CustomRecipe; -import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.item.crafting.RecipeType; -import net.minecraft.world.item.crafting.SimpleRecipeSerializer; +import net.minecraft.world.item.crafting.*; import net.minecraft.world.level.Level; +import org.violetmoon.quark.content.tweaks.module.SlabsToBlocksModule; + +import java.util.Optional; public class SlabToBlockRecipe extends CustomRecipe { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/AncientSaplingBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/AncientSaplingBlock.java index 6a4cb31def..8708a1a546 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/AncientSaplingBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/AncientSaplingBlock.java @@ -1,21 +1,7 @@ package org.violetmoon.quark.content.world.block; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.OptionalInt; -import java.util.function.BiConsumer; -import java.util.stream.Collectors; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkSaplingBlock; -import org.violetmoon.quark.content.world.module.AncientWoodModule; -import org.violetmoon.zeta.module.ZetaModule; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; - import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.util.RandomSource; @@ -35,6 +21,17 @@ import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecoratorType; import net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacer; import net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType; +import org.violetmoon.quark.base.block.QuarkSaplingBlock; +import org.violetmoon.quark.content.world.module.AncientWoodModule; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.OptionalInt; +import java.util.function.BiConsumer; +import java.util.stream.Collectors; public class AncientSaplingBlock extends QuarkSaplingBlock { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/BlossomLeavesBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/BlossomLeavesBlock.java index bd9a7c205f..f15150f517 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/BlossomLeavesBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/BlossomLeavesBlock.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.world.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkLeavesBlock; -import org.violetmoon.quark.content.world.module.BlossomTreesModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.particles.BlockParticleOption; import net.minecraft.core.particles.ParticleTypes; @@ -13,6 +7,11 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MaterialColor; +import org.violetmoon.quark.base.block.QuarkLeavesBlock; +import org.violetmoon.quark.content.world.module.BlossomTreesModule; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class BlossomLeavesBlock extends QuarkLeavesBlock { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/BlossomSaplingBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/BlossomSaplingBlock.java index 068448b42f..05aa19c860 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/BlossomSaplingBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/BlossomSaplingBlock.java @@ -1,13 +1,5 @@ package org.violetmoon.quark.content.world.block; -import java.util.OptionalInt; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkSaplingBlock; -import org.violetmoon.quark.content.world.module.BlossomTreesModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.Holder; import net.minecraft.util.RandomSource; import net.minecraft.util.valueproviders.ConstantInt; @@ -21,6 +13,12 @@ import net.minecraft.world.level.levelgen.feature.foliageplacers.FancyFoliagePlacer; import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; import net.minecraft.world.level.levelgen.feature.trunkplacers.FancyTrunkPlacer; +import org.violetmoon.quark.base.block.QuarkSaplingBlock; +import org.violetmoon.quark.content.world.module.BlossomTreesModule; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import java.util.OptionalInt; public class BlossomSaplingBlock extends QuarkSaplingBlock { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/ChorusVegetationBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/ChorusVegetationBlock.java index 7f86954636..86cce12a61 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/ChorusVegetationBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/ChorusVegetationBlock.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.world.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.quark.content.world.module.ChorusVegetationModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; @@ -37,6 +30,12 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.common.IForgeShearable; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.quark.content.world.module.ChorusVegetationModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nonnull; public class ChorusVegetationBlock extends QuarkBlock implements BonemealableBlock, IForgeShearable { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/CorundumBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/CorundumBlock.java index 609e4d32b1..7511eed853 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/CorundumBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/CorundumBlock.java @@ -1,16 +1,6 @@ package org.violetmoon.quark.content.world.block; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.block.QuarkGlassBlock; -import org.violetmoon.quark.content.world.module.CorundumModule; -import org.violetmoon.quark.content.world.module.SpiralSpiresModule; -import org.violetmoon.zeta.module.ZetaModule; - import com.mojang.math.Vector3f; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.DustParticleOptions; @@ -25,6 +15,14 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.block.QuarkGlassBlock; +import org.violetmoon.quark.content.world.module.CorundumModule; +import org.violetmoon.quark.content.world.module.SpiralSpiresModule; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * @author WireSegal diff --git a/src/main/java/org/violetmoon/quark/content/world/block/CorundumClusterBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/CorundumClusterBlock.java index 2c35ee6167..cc155d5913 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/CorundumClusterBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/CorundumClusterBlock.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.world.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.IQuarkBlock; -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.zeta.registry.RenderLayerRegistry; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.tags.FluidTags; @@ -28,6 +22,11 @@ import net.minecraft.world.level.pathfinder.PathComputationType; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; +import org.violetmoon.quark.base.block.IQuarkBlock; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.zeta.registry.RenderLayerRegistry; + +import javax.annotation.Nonnull; public class CorundumClusterBlock extends QuarkBlock implements SimpleWaterloggedBlock { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/ElderPrismarineBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/ElderPrismarineBlock.java index b85a8fc90a..db887f8f78 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/ElderPrismarineBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/ElderPrismarineBlock.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.content.world.block; -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.block.QuarkBlock; +import org.violetmoon.zeta.module.ZetaModule; public class ElderPrismarineBlock extends QuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/GlowLichenGrowthBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/GlowLichenGrowthBlock.java index a222938b12..0706f2e91c 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/GlowLichenGrowthBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/GlowLichenGrowthBlock.java @@ -1,16 +1,6 @@ package org.violetmoon.quark.content.world.block; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkBushBlock; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.zeta.module.ZetaModule; - import com.google.common.collect.Lists; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; @@ -27,6 +17,13 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.block.QuarkBushBlock; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import java.util.Collections; +import java.util.List; public class GlowLichenGrowthBlock extends QuarkBushBlock implements BonemealableBlock { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/GlowShroomBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/GlowShroomBlock.java index 91785b3f20..39fc3fde74 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/GlowShroomBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/GlowShroomBlock.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.content.world.block; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.block.QuarkBushBlock; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; @@ -20,6 +15,10 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.block.QuarkBushBlock; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; public class GlowShroomBlock extends QuarkBushBlock implements BonemealableBlock { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/GlowShroomRingBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/GlowShroomRingBlock.java index c211f7d709..03558cd266 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/GlowShroomRingBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/GlowShroomRingBlock.java @@ -22,14 +22,12 @@ import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.handler.CreativeTabHandler; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.RenderLayerRegistry; +import javax.annotation.Nonnull; import java.util.Map; // Mostly a copy of BaseCoralWallFanBlock diff --git a/src/main/java/org/violetmoon/quark/content/world/block/HugeGlowShroomBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/HugeGlowShroomBlock.java index d559b1d793..f293144b0b 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/HugeGlowShroomBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/HugeGlowShroomBlock.java @@ -1,16 +1,5 @@ package org.violetmoon.quark.content.world.block; -import java.util.function.BooleanSupplier; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.block.IQuarkBlock; -import org.violetmoon.quark.base.handler.CreativeTabHandler; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.content.world.module.GlimmeringWealdModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; @@ -25,6 +14,15 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.block.IQuarkBlock; +import org.violetmoon.quark.base.handler.CreativeTabHandler; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.content.world.module.GlimmeringWealdModule; +import org.violetmoon.zeta.module.ZetaModule; + +import javax.annotation.Nonnull; +import java.util.function.BooleanSupplier; public class HugeGlowShroomBlock extends HugeMushroomBlock implements IQuarkBlock { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/MonsterBoxBlock.java b/src/main/java/org/violetmoon/quark/content/world/block/MonsterBoxBlock.java index 13fdd8656f..bc2b282c62 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/MonsterBoxBlock.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/MonsterBoxBlock.java @@ -12,15 +12,14 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.pathfinder.PathComputationType; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.content.world.block.be.MonsterBoxBlockEntity; import org.violetmoon.quark.content.world.module.MonsterBoxModule; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.RenderLayerRegistry; +import javax.annotation.Nonnull; + public class MonsterBoxBlock extends QuarkBlock implements EntityBlock { public MonsterBoxBlock(ZetaModule module) { diff --git a/src/main/java/org/violetmoon/quark/content/world/block/MyaliteColorLogic.java b/src/main/java/org/violetmoon/quark/content/world/block/MyaliteColorLogic.java index e06330f3d4..bfb434fa11 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/MyaliteColorLogic.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/MyaliteColorLogic.java @@ -1,13 +1,13 @@ package org.violetmoon.quark.content.world.block; -import java.awt.*; -import java.util.List; - import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise; +import java.awt.*; +import java.util.List; + public class MyaliteColorLogic { protected static final float s = 0.7f; protected static final float b = 0.8f; diff --git a/src/main/java/org/violetmoon/quark/content/world/block/be/MonsterBoxBlockEntity.java b/src/main/java/org/violetmoon/quark/content/world/block/be/MonsterBoxBlockEntity.java index a35f360e87..e86098d96b 100644 --- a/src/main/java/org/violetmoon/quark/content/world/block/be/MonsterBoxBlockEntity.java +++ b/src/main/java/org/violetmoon/quark/content/world/block/be/MonsterBoxBlockEntity.java @@ -21,13 +21,12 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; - -import java.util.List; - import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.content.world.module.MonsterBoxModule; import org.violetmoon.zeta.block.be.ZetaBlockEntity; +import java.util.List; + public class MonsterBoxBlockEntity extends ZetaBlockEntity { private int breakProgress; diff --git a/src/main/java/org/violetmoon/quark/content/world/config/BigStoneClusterConfig.java b/src/main/java/org/violetmoon/quark/content/world/config/BigStoneClusterConfig.java index 8885a30171..2c176923ba 100644 --- a/src/main/java/org/violetmoon/quark/content/world/config/BigStoneClusterConfig.java +++ b/src/main/java/org/violetmoon/quark/content/world/config/BigStoneClusterConfig.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.content.world.config; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.ClusterSizeConfig; import org.violetmoon.quark.base.config.type.CompoundBiomeConfig; import org.violetmoon.quark.base.config.type.DimensionConfig; import org.violetmoon.quark.base.config.type.IBiomeConfig; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.biome.Biome; - public class BigStoneClusterConfig extends ClusterSizeConfig { @Config diff --git a/src/main/java/org/violetmoon/quark/content/world/config/BlossomTreeConfig.java b/src/main/java/org/violetmoon/quark/content/world/config/BlossomTreeConfig.java index fb1e5044b4..82b8c43c63 100644 --- a/src/main/java/org/violetmoon/quark/content/world/config/BlossomTreeConfig.java +++ b/src/main/java/org/violetmoon/quark/content/world/config/BlossomTreeConfig.java @@ -1,13 +1,12 @@ package org.violetmoon.quark.content.world.config; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.CompoundBiomeConfig; import org.violetmoon.quark.base.config.type.DimensionConfig; import org.violetmoon.quark.base.config.type.IConfigType; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.biome.Biome; - public class BlossomTreeConfig implements IConfigType { @Config diff --git a/src/main/java/org/violetmoon/quark/content/world/feature/GlowExtrasFeature.java b/src/main/java/org/violetmoon/quark/content/world/feature/GlowExtrasFeature.java index 2ffc81e0a2..e5bd41750c 100644 --- a/src/main/java/org/violetmoon/quark/content/world/feature/GlowExtrasFeature.java +++ b/src/main/java/org/violetmoon/quark/content/world/feature/GlowExtrasFeature.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.content.world.feature; -import java.util.Arrays; -import java.util.List; - -import org.violetmoon.quark.content.world.module.GlimmeringWealdModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.core.Direction; @@ -19,11 +14,11 @@ import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import net.minecraft.world.level.levelgen.placement.BiomeFilter; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import net.minecraft.world.level.levelgen.placement.InSquarePlacement; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.RandomOffsetPlacement; +import net.minecraft.world.level.levelgen.placement.*; +import org.violetmoon.quark.content.world.module.GlimmeringWealdModule; + +import java.util.Arrays; +import java.util.List; public class GlowExtrasFeature extends Feature { diff --git a/src/main/java/org/violetmoon/quark/content/world/feature/GlowShroomsFeature.java b/src/main/java/org/violetmoon/quark/content/world/feature/GlowShroomsFeature.java index 6dbfd82624..f23e04f987 100644 --- a/src/main/java/org/violetmoon/quark/content/world/feature/GlowShroomsFeature.java +++ b/src/main/java/org/violetmoon/quark/content/world/feature/GlowShroomsFeature.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.world.feature; -import java.util.Arrays; -import java.util.List; - -import org.violetmoon.quark.content.world.block.HugeGlowShroomBlock; -import org.violetmoon.quark.content.world.module.GlimmeringWealdModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.core.Direction; @@ -19,12 +13,12 @@ import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import net.minecraft.world.level.levelgen.placement.BiomeFilter; -import net.minecraft.world.level.levelgen.placement.CountPlacement; -import net.minecraft.world.level.levelgen.placement.EnvironmentScanPlacement; -import net.minecraft.world.level.levelgen.placement.InSquarePlacement; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.RandomOffsetPlacement; +import net.minecraft.world.level.levelgen.placement.*; +import org.violetmoon.quark.content.world.block.HugeGlowShroomBlock; +import org.violetmoon.quark.content.world.module.GlimmeringWealdModule; + +import java.util.Arrays; +import java.util.List; public class GlowShroomsFeature extends Feature { diff --git a/src/main/java/org/violetmoon/quark/content/world/gen/BigStoneClusterGenerator.java b/src/main/java/org/violetmoon/quark/content/world/gen/BigStoneClusterGenerator.java index 9f79d1acbb..d6564c4a90 100644 --- a/src/main/java/org/violetmoon/quark/content/world/gen/BigStoneClusterGenerator.java +++ b/src/main/java/org/violetmoon/quark/content/world/gen/BigStoneClusterGenerator.java @@ -1,22 +1,20 @@ package org.violetmoon.quark.content.world.gen; -import java.util.Objects; -import java.util.Random; -import java.util.function.BooleanSupplier; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.world.generator.multichunk.ClusterBasedGenerator; -import org.violetmoon.quark.content.world.config.AirStoneClusterConfig; -import org.violetmoon.quark.content.world.config.BigStoneClusterConfig; -import org.violetmoon.quark.content.world.module.BigStoneClustersModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; import net.minecraft.server.level.WorldGenRegion; import net.minecraft.world.level.ServerLevelAccessor; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkGenerator; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.world.generator.multichunk.ClusterBasedGenerator; +import org.violetmoon.quark.content.world.config.AirStoneClusterConfig; +import org.violetmoon.quark.content.world.config.BigStoneClusterConfig; +import org.violetmoon.quark.content.world.module.BigStoneClustersModule; + +import java.util.Objects; +import java.util.Random; +import java.util.function.BooleanSupplier; public class BigStoneClusterGenerator extends ClusterBasedGenerator { diff --git a/src/main/java/org/violetmoon/quark/content/world/gen/BlossomTreeGenerator.java b/src/main/java/org/violetmoon/quark/content/world/gen/BlossomTreeGenerator.java index 233d2fb113..cd87c00882 100644 --- a/src/main/java/org/violetmoon/quark/content/world/gen/BlossomTreeGenerator.java +++ b/src/main/java/org/violetmoon/quark/content/world/gen/BlossomTreeGenerator.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.world.gen; -import java.util.Optional; - -import org.violetmoon.quark.base.world.generator.Generator; -import org.violetmoon.quark.content.world.block.BlossomSaplingBlock.BlossomTree; -import org.violetmoon.quark.content.world.config.BlossomTreeConfig; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.WorldGenRegion; @@ -20,6 +14,11 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration; import net.minecraft.world.level.material.Fluids; +import org.violetmoon.quark.base.world.generator.Generator; +import org.violetmoon.quark.content.world.block.BlossomSaplingBlock.BlossomTree; +import org.violetmoon.quark.content.world.config.BlossomTreeConfig; + +import java.util.Optional; public class BlossomTreeGenerator extends Generator { diff --git a/src/main/java/org/violetmoon/quark/content/world/gen/ChorusVegetationGenerator.java b/src/main/java/org/violetmoon/quark/content/world/gen/ChorusVegetationGenerator.java index 19f2fdb44b..63a4570f9e 100644 --- a/src/main/java/org/violetmoon/quark/content/world/gen/ChorusVegetationGenerator.java +++ b/src/main/java/org/violetmoon/quark/content/world/gen/ChorusVegetationGenerator.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.world.gen; -import java.util.Random; - -import org.violetmoon.quark.base.config.type.DimensionConfig; -import org.violetmoon.quark.base.world.generator.multichunk.MultiChunkFeatureGenerator; -import org.violetmoon.quark.content.world.module.ChorusVegetationModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.Vec3i; @@ -16,6 +10,11 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkGenerator; +import org.violetmoon.quark.base.config.type.DimensionConfig; +import org.violetmoon.quark.base.world.generator.multichunk.MultiChunkFeatureGenerator; +import org.violetmoon.quark.content.world.module.ChorusVegetationModule; + +import java.util.Random; public class ChorusVegetationGenerator extends MultiChunkFeatureGenerator { diff --git a/src/main/java/org/violetmoon/quark/content/world/gen/FairyRingGenerator.java b/src/main/java/org/violetmoon/quark/content/world/gen/FairyRingGenerator.java index 07445b1f13..02065d4037 100644 --- a/src/main/java/org/violetmoon/quark/content/world/gen/FairyRingGenerator.java +++ b/src/main/java/org/violetmoon/quark/content/world/gen/FairyRingGenerator.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.world.gen; -import java.util.List; - -import org.violetmoon.quark.base.config.type.DimensionConfig; -import org.violetmoon.quark.base.world.generator.Generator; -import org.violetmoon.quark.content.world.module.FairyRingsModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Holder; @@ -23,6 +17,11 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature; import net.minecraft.world.level.material.Material; import net.minecraftforge.common.Tags; +import org.violetmoon.quark.base.config.type.DimensionConfig; +import org.violetmoon.quark.base.world.generator.Generator; +import org.violetmoon.quark.content.world.module.FairyRingsModule; + +import java.util.List; public class FairyRingGenerator extends Generator { diff --git a/src/main/java/org/violetmoon/quark/content/world/gen/MonsterBoxGenerator.java b/src/main/java/org/violetmoon/quark/content/world/gen/MonsterBoxGenerator.java index 9f0dcf289f..d4fb8c15c4 100644 --- a/src/main/java/org/violetmoon/quark/content/world/gen/MonsterBoxGenerator.java +++ b/src/main/java/org/violetmoon/quark/content/world/gen/MonsterBoxGenerator.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.content.world.gen; -import org.violetmoon.quark.base.config.type.DimensionConfig; -import org.violetmoon.quark.base.world.generator.Generator; -import org.violetmoon.quark.content.world.module.MonsterBoxModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.WorldGenRegion; @@ -12,6 +8,9 @@ import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.levelgen.FlatLevelSource; import net.minecraft.world.level.material.Material; +import org.violetmoon.quark.base.config.type.DimensionConfig; +import org.violetmoon.quark.base.world.generator.Generator; +import org.violetmoon.quark.content.world.module.MonsterBoxModule; public class MonsterBoxGenerator extends Generator { diff --git a/src/main/java/org/violetmoon/quark/content/world/gen/ObsidianSpikeGenerator.java b/src/main/java/org/violetmoon/quark/content/world/gen/ObsidianSpikeGenerator.java index 6389b13661..e27882d4eb 100644 --- a/src/main/java/org/violetmoon/quark/content/world/gen/ObsidianSpikeGenerator.java +++ b/src/main/java/org/violetmoon/quark/content/world/gen/ObsidianSpikeGenerator.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.world.gen; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.config.type.DimensionConfig; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.base.world.generator.Generator; -import org.violetmoon.quark.content.building.module.CompressedBlocksModule; -import org.violetmoon.quark.content.world.module.NetherObsidianSpikesModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; @@ -20,6 +13,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.material.Material; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.config.type.DimensionConfig; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.base.world.generator.Generator; +import org.violetmoon.quark.content.building.module.CompressedBlocksModule; +import org.violetmoon.quark.content.world.module.NetherObsidianSpikesModule; public class ObsidianSpikeGenerator extends Generator { diff --git a/src/main/java/org/violetmoon/quark/content/world/gen/SpiralSpireGenerator.java b/src/main/java/org/violetmoon/quark/content/world/gen/SpiralSpireGenerator.java index b7192b2155..c0f6adc13f 100644 --- a/src/main/java/org/violetmoon/quark/content/world/gen/SpiralSpireGenerator.java +++ b/src/main/java/org/violetmoon/quark/content/world/gen/SpiralSpireGenerator.java @@ -1,12 +1,5 @@ package org.violetmoon.quark.content.world.gen; -import java.util.Random; - -import org.violetmoon.quark.base.config.type.DimensionConfig; -import org.violetmoon.quark.base.world.generator.multichunk.MultiChunkFeatureGenerator; -import org.violetmoon.quark.content.world.module.NewStoneTypesModule; -import org.violetmoon.quark.content.world.module.SpiralSpiresModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.Vec3i; @@ -15,6 +8,12 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkGenerator; +import org.violetmoon.quark.base.config.type.DimensionConfig; +import org.violetmoon.quark.base.world.generator.multichunk.MultiChunkFeatureGenerator; +import org.violetmoon.quark.content.world.module.NewStoneTypesModule; +import org.violetmoon.quark.content.world.module.SpiralSpiresModule; + +import java.util.Random; public class SpiralSpireGenerator extends MultiChunkFeatureGenerator { diff --git a/src/main/java/org/violetmoon/quark/content/world/item/AncientFruitItem.java b/src/main/java/org/violetmoon/quark/content/world/item/AncientFruitItem.java index 937f5ab1cd..bcf5ccf890 100644 --- a/src/main/java/org/violetmoon/quark/content/world/item/AncientFruitItem.java +++ b/src/main/java/org/violetmoon/quark/content/world/item/AncientFruitItem.java @@ -1,9 +1,5 @@ package org.violetmoon.quark.content.world.item; -import org.violetmoon.quark.base.item.QuarkItem; -import org.violetmoon.quark.content.world.module.AncientWoodModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.LivingEntity; @@ -13,6 +9,9 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import org.violetmoon.quark.base.item.QuarkItem; +import org.violetmoon.quark.content.world.module.AncientWoodModule; +import org.violetmoon.zeta.module.ZetaModule; public class AncientFruitItem extends QuarkItem { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java b/src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java index a934734c9a..85dbc33c6c 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java @@ -1,5 +1,15 @@ package org.violetmoon.quark.content.world.module; +import com.google.common.base.Functions; +import com.google.common.collect.ImmutableSet; +import net.minecraft.core.Registry; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.ComposterBlock; +import net.minecraft.world.level.material.MaterialColor; +import net.minecraft.world.level.storage.loot.BuiltInLootTables; +import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.QuarkLeavesBlock; import org.violetmoon.quark.base.config.Config; @@ -21,18 +31,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import com.google.common.base.Functions; -import com.google.common.collect.ImmutableSet; - -import net.minecraft.core.Registry; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.ComposterBlock; -import net.minecraft.world.level.material.MaterialColor; -import net.minecraft.world.level.storage.loot.BuiltInLootTables; -import net.minecraft.world.level.storage.loot.entries.LootItem; -import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; - @ZetaLoadModule(category = "world") public class AncientWoodModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/AzaleaWoodModule.java b/src/main/java/org/violetmoon/quark/content/world/module/AzaleaWoodModule.java index 737f5e4d1e..e82d8e2866 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/AzaleaWoodModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/AzaleaWoodModule.java @@ -1,18 +1,17 @@ package org.violetmoon.quark.content.world.module; -import org.violetmoon.quark.base.handler.WoodSetHandler; -import org.violetmoon.quark.base.handler.WoodSetHandler.WoodSet; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - import net.minecraft.data.worldgen.features.TreeFeatures; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration; import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; import net.minecraft.world.level.material.MaterialColor; +import org.violetmoon.quark.base.handler.WoodSetHandler; +import org.violetmoon.quark.base.handler.WoodSetHandler.WoodSet; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; @ZetaLoadModule(category = "world", antiOverlap = { "caverns_and_chasms" }) public class AzaleaWoodModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/BigStoneClustersModule.java b/src/main/java/org/violetmoon/quark/content/world/module/BigStoneClustersModule.java index 660fbd589b..1d8c7ae3d7 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/BigStoneClustersModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/BigStoneClustersModule.java @@ -10,11 +10,6 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraftforge.common.Tags; - -import java.util.List; -import java.util.function.BiPredicate; -import java.util.function.BooleanSupplier; - import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.CompoundBiomeConfig; import org.violetmoon.quark.base.config.type.DimensionConfig; @@ -31,6 +26,10 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.List; +import java.util.function.BiPredicate; +import java.util.function.BooleanSupplier; + @ZetaLoadModule(category = "world") public class BigStoneClustersModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java b/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java index 35cc8655e9..e3eac479ff 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java @@ -1,8 +1,12 @@ package org.violetmoon.quark.content.world.module; -import java.util.HashMap; -import java.util.Map; - +import com.google.common.base.Functions; +import net.minecraft.core.Registry; +import net.minecraft.tags.BiomeTags; +import net.minecraft.world.level.block.ComposterBlock; +import net.minecraft.world.level.levelgen.GenerationStep.Decoration; +import net.minecraft.world.level.material.MaterialColor; +import net.minecraftforge.common.Tags; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.VariantHandler; import org.violetmoon.quark.base.handler.WoodSetHandler; @@ -22,14 +26,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import com.google.common.base.Functions; - -import net.minecraft.core.Registry; -import net.minecraft.tags.BiomeTags; -import net.minecraft.world.level.block.ComposterBlock; -import net.minecraft.world.level.levelgen.GenerationStep.Decoration; -import net.minecraft.world.level.material.MaterialColor; -import net.minecraftforge.common.Tags; +import java.util.HashMap; +import java.util.Map; @ZetaLoadModule(category = "world") public class BlossomTreesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/ChorusVegetationModule.java b/src/main/java/org/violetmoon/quark/content/world/module/ChorusVegetationModule.java index 711db1101d..463d237118 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/ChorusVegetationModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/ChorusVegetationModule.java @@ -1,5 +1,8 @@ package org.violetmoon.quark.content.world.module; +import com.google.common.base.Functions; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.VariantHandler; import org.violetmoon.quark.base.world.WorldGenHandler; @@ -13,10 +16,6 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import com.google.common.base.Functions; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.levelgen.GenerationStep.Decoration; - @ZetaLoadModule(category = "world") public class ChorusVegetationModule extends ZetaModule { @Config public static int rarity = 150; diff --git a/src/main/java/org/violetmoon/quark/content/world/module/FairyRingsModule.java b/src/main/java/org/violetmoon/quark/content/world/module/FairyRingsModule.java index 2da40bde90..b97911b618 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/FairyRingsModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/FairyRingsModule.java @@ -7,10 +7,6 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; - -import java.util.ArrayList; -import java.util.List; - import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.DimensionConfig; import org.violetmoon.quark.base.world.WorldGenHandler; @@ -22,6 +18,9 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.ArrayList; +import java.util.List; + @ZetaLoadModule(category = "world") public class FairyRingsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/GlimmeringWealdModule.java b/src/main/java/org/violetmoon/quark/content/world/module/GlimmeringWealdModule.java index 8c940c5586..82f04bd35a 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/GlimmeringWealdModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/GlimmeringWealdModule.java @@ -32,9 +32,6 @@ import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; import net.minecraft.world.level.levelgen.placement.PlacedFeature; import net.minecraft.world.level.levelgen.placement.PlacementModifier; - -import java.util.List; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.QuarkSounds; @@ -56,6 +53,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.List; + @ZetaLoadModule(category = "world") public class GlimmeringWealdModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/MonsterBoxModule.java b/src/main/java/org/violetmoon/quark/content/world/module/MonsterBoxModule.java index 74187a6e7a..79caa886c3 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/MonsterBoxModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/MonsterBoxModule.java @@ -11,9 +11,6 @@ import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; - -import java.util.ArrayList; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.DimensionConfig; @@ -31,6 +28,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.ArrayList; + @ZetaLoadModule(category = "world") public class MonsterBoxModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/NetherObsidianSpikesModule.java b/src/main/java/org/violetmoon/quark/content/world/module/NetherObsidianSpikesModule.java index 420b2dca1b..9bed6bf640 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/NetherObsidianSpikesModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/NetherObsidianSpikesModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.world.module; +import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.config.type.DimensionConfig; import org.violetmoon.quark.base.world.WorldGenHandler; @@ -10,8 +11,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.level.levelgen.GenerationStep.Decoration; - @ZetaLoadModule(category = "world") public class NetherObsidianSpikesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/NewStoneTypesModule.java b/src/main/java/org/violetmoon/quark/content/world/module/NewStoneTypesModule.java index 34b5705131..5a9745e044 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/NewStoneTypesModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/NewStoneTypesModule.java @@ -1,10 +1,20 @@ package org.violetmoon.quark.content.world.module; -import java.util.ArrayDeque; -import java.util.Map; -import java.util.Queue; -import java.util.function.BooleanSupplier; - +import com.google.common.collect.Maps; +import net.minecraft.client.Minecraft; +import net.minecraft.client.color.block.BlockColor; +import net.minecraft.client.color.item.ItemColor; +import net.minecraft.core.BlockPos; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.levelgen.GenerationStep.Decoration; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.material.MaterialColor; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.IQuarkBlock; import org.violetmoon.quark.base.block.QuarkBlock; @@ -29,22 +39,10 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import com.google.common.collect.Maps; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.color.block.BlockColor; -import net.minecraft.client.color.item.ItemColor; -import net.minecraft.core.BlockPos; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.levelgen.GenerationStep.Decoration; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.material.MaterialColor; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.HitResult; +import java.util.ArrayDeque; +import java.util.Map; +import java.util.Queue; +import java.util.function.BooleanSupplier; @ZetaLoadModule(category = "world") public class NewStoneTypesModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/NoMoreLavaPocketsModule.java b/src/main/java/org/violetmoon/quark/content/world/module/NoMoreLavaPocketsModule.java index f99ebb006d..1dddc74385 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/NoMoreLavaPocketsModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/NoMoreLavaPocketsModule.java @@ -1,13 +1,12 @@ package org.violetmoon.quark.content.world.module; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZConfigChanged; import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.tags.FluidTags; -import net.minecraft.world.level.levelgen.feature.configurations.SpringConfiguration; - @ZetaLoadModule(category = "world") public class NoMoreLavaPocketsModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/PermafrostModule.java b/src/main/java/org/violetmoon/quark/content/world/module/PermafrostModule.java index 3108305364..70ead60013 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/PermafrostModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/PermafrostModule.java @@ -1,5 +1,10 @@ package org.violetmoon.quark.content.world.module; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.material.MaterialColor; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.config.type.CompoundBiomeConfig; import org.violetmoon.quark.base.handler.VariantHandler; @@ -11,12 +16,6 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.material.MaterialColor; - @ZetaLoadModule(category = "world") public class PermafrostModule extends AbstractUndergroundStyleModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/SpiralSpiresModule.java b/src/main/java/org/violetmoon/quark/content/world/module/SpiralSpiresModule.java index 6121bb820a..800affaa1f 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/SpiralSpiresModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/SpiralSpiresModule.java @@ -16,10 +16,6 @@ import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; - -import java.util.ArrayList; -import java.util.List; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.block.QuarkBlock; import org.violetmoon.quark.base.config.Config; @@ -43,6 +39,9 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; +import java.util.ArrayList; +import java.util.List; + @ZetaLoadModule(category = "world") public class SpiralSpiresModule extends ZetaModule { diff --git a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/CorundumStyle.java b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/CorundumStyle.java index c42593353b..489e4f7d29 100644 --- a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/CorundumStyle.java +++ b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/CorundumStyle.java @@ -1,14 +1,5 @@ package org.violetmoon.quark.content.world.undergroundstyle; -import java.util.Random; - -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.content.world.block.CorundumBlock; -import org.violetmoon.quark.content.world.block.CorundumClusterBlock; -import org.violetmoon.quark.content.world.module.CorundumModule; -import org.violetmoon.quark.content.world.undergroundstyle.base.BasicUndergroundStyle; -import org.violetmoon.quark.content.world.undergroundstyle.base.UndergroundStyleGenerator.Context; - import it.unimi.dsi.fastutil.ints.Int2ByteArrayMap; import it.unimi.dsi.fastutil.ints.Int2ByteMap; import net.minecraft.core.BlockPos; @@ -17,6 +8,14 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluids; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.content.world.block.CorundumBlock; +import org.violetmoon.quark.content.world.block.CorundumClusterBlock; +import org.violetmoon.quark.content.world.module.CorundumModule; +import org.violetmoon.quark.content.world.undergroundstyle.base.BasicUndergroundStyle; +import org.violetmoon.quark.content.world.undergroundstyle.base.UndergroundStyleGenerator.Context; + +import java.util.Random; public class CorundumStyle extends BasicUndergroundStyle { diff --git a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/PermafrostStyle.java b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/PermafrostStyle.java index 90b76e7994..bf77902597 100644 --- a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/PermafrostStyle.java +++ b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/PermafrostStyle.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.content.world.undergroundstyle; -import org.violetmoon.quark.content.world.undergroundstyle.base.BasicUndergroundStyle; -import org.violetmoon.quark.content.world.undergroundstyle.base.UndergroundStyleGenerator.Context; - import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.content.world.undergroundstyle.base.BasicUndergroundStyle; +import org.violetmoon.quark.content.world.undergroundstyle.base.UndergroundStyleGenerator.Context; public class PermafrostStyle extends BasicUndergroundStyle { diff --git a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/AbstractUndergroundStyleModule.java b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/AbstractUndergroundStyleModule.java index 0016259050..d91685008c 100644 --- a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/AbstractUndergroundStyleModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/AbstractUndergroundStyleModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.world.undergroundstyle.base; +import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.world.WorldGenHandler; import org.violetmoon.quark.base.world.WorldGenWeights; @@ -7,8 +8,6 @@ import org.violetmoon.zeta.event.load.ZCommonSetup; import org.violetmoon.zeta.module.ZetaModule; -import net.minecraft.world.level.levelgen.GenerationStep.Decoration; - public abstract class AbstractUndergroundStyleModule extends ZetaModule { @Config diff --git a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/BasicUndergroundStyle.java b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/BasicUndergroundStyle.java index 727c996b23..9151581de7 100644 --- a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/BasicUndergroundStyle.java +++ b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/BasicUndergroundStyle.java @@ -1,9 +1,8 @@ package org.violetmoon.quark.content.world.undergroundstyle.base; -import org.violetmoon.quark.content.world.undergroundstyle.base.UndergroundStyleGenerator.Context; - import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.content.world.undergroundstyle.base.UndergroundStyleGenerator.Context; public class BasicUndergroundStyle extends UndergroundStyle { diff --git a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyle.java b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyle.java index ffc11070d5..ebed36d68d 100644 --- a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyle.java +++ b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyle.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.content.world.undergroundstyle.base; -import java.util.function.Predicate; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.content.world.undergroundstyle.base.UndergroundStyleGenerator.Context; - import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.core.Direction; @@ -16,6 +10,11 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Rotation; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.content.world.undergroundstyle.base.UndergroundStyleGenerator.Context; + +import java.util.function.Predicate; public abstract class UndergroundStyle { diff --git a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyleConfig.java b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyleConfig.java index 5b2315e866..a25ec0a483 100644 --- a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyleConfig.java +++ b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyleConfig.java @@ -1,10 +1,9 @@ package org.violetmoon.quark.content.world.undergroundstyle.base; -import org.violetmoon.quark.base.config.type.ClusterSizeConfig; -import org.violetmoon.quark.base.config.type.IBiomeConfig; - import net.minecraft.tags.TagKey; import net.minecraft.world.level.biome.Biome; +import org.violetmoon.quark.base.config.type.ClusterSizeConfig; +import org.violetmoon.quark.base.config.type.IBiomeConfig; public class UndergroundStyleConfig extends ClusterSizeConfig { diff --git a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyleGenerator.java b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyleGenerator.java index e14bbe8cfc..42351944e0 100644 --- a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyleGenerator.java +++ b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyleGenerator.java @@ -1,19 +1,14 @@ package org.violetmoon.quark.content.world.undergroundstyle.base; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Random; - -import org.violetmoon.quark.base.world.generator.multichunk.ClusterBasedGenerator; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Holder; import net.minecraft.server.level.WorldGenRegion; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.chunk.ChunkGenerator; +import org.violetmoon.quark.base.world.generator.multichunk.ClusterBasedGenerator; + +import java.util.*; public class UndergroundStyleGenerator extends ClusterBasedGenerator { diff --git a/src/main/java/org/violetmoon/quark/integration/claim/FlanIntegration.java b/src/main/java/org/violetmoon/quark/integration/claim/FlanIntegration.java index 53618765b7..ab77005d3e 100644 --- a/src/main/java/org/violetmoon/quark/integration/claim/FlanIntegration.java +++ b/src/main/java/org/violetmoon/quark/integration/claim/FlanIntegration.java @@ -8,11 +8,10 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; +import org.violetmoon.quark.base.Quark; import javax.annotation.Nonnull; -import org.violetmoon.quark.base.Quark; - public final class FlanIntegration implements IClaimIntegration{ @Override diff --git a/src/main/java/org/violetmoon/quark/integration/jei/BackpackRecipeTransferHandler.java b/src/main/java/org/violetmoon/quark/integration/jei/BackpackRecipeTransferHandler.java index 3d5836b9fe..626e30993f 100644 --- a/src/main/java/org/violetmoon/quark/integration/jei/BackpackRecipeTransferHandler.java +++ b/src/main/java/org/violetmoon/quark/integration/jei/BackpackRecipeTransferHandler.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.integration.jei; -import java.util.List; -import java.util.Optional; - -import org.jetbrains.annotations.Nullable; -import org.violetmoon.quark.addons.oddities.inventory.BackpackMenu; - import it.unimi.dsi.fastutil.ints.IntArraySet; import it.unimi.dsi.fastutil.ints.IntSet; import mezz.jei.api.constants.RecipeTypes; @@ -20,6 +14,11 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.crafting.CraftingRecipe; +import org.jetbrains.annotations.Nullable; +import org.violetmoon.quark.addons.oddities.inventory.BackpackMenu; + +import java.util.List; +import java.util.Optional; /** * Essentially just a copy of JEI's PlayerRecipeTransferHandler, but for BackpackMenu. diff --git a/src/main/java/org/violetmoon/quark/integration/jei/ElytraDuplicationExtension.java b/src/main/java/org/violetmoon/quark/integration/jei/ElytraDuplicationExtension.java index 334e44faf4..ffefa517a9 100644 --- a/src/main/java/org/violetmoon/quark/integration/jei/ElytraDuplicationExtension.java +++ b/src/main/java/org/violetmoon/quark/integration/jei/ElytraDuplicationExtension.java @@ -12,11 +12,9 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; - -import javax.annotation.Nonnull; - import org.violetmoon.quark.content.tweaks.recipe.ElytraDuplicationRecipe; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/violetmoon/quark/integration/jei/InfluenceCategory.java b/src/main/java/org/violetmoon/quark/integration/jei/InfluenceCategory.java index 840b3cfe53..e50056d300 100644 --- a/src/main/java/org/violetmoon/quark/integration/jei/InfluenceCategory.java +++ b/src/main/java/org/violetmoon/quark/integration/jei/InfluenceCategory.java @@ -1,10 +1,5 @@ package org.violetmoon.quark.integration.jei; -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; -import org.violetmoon.quark.base.Quark; - import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.drawable.IDrawable; @@ -17,6 +12,10 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; +import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; +import org.violetmoon.quark.base.Quark; + +import javax.annotation.Nonnull; public class InfluenceCategory implements IRecipeCategory { diff --git a/src/main/java/org/violetmoon/quark/integration/jei/InfluenceEntry.java b/src/main/java/org/violetmoon/quark/integration/jei/InfluenceEntry.java index f99a81519a..2aab914707 100644 --- a/src/main/java/org/violetmoon/quark/integration/jei/InfluenceEntry.java +++ b/src/main/java/org/violetmoon/quark/integration/jei/InfluenceEntry.java @@ -11,15 +11,14 @@ import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentInstance; import net.minecraft.world.level.block.Block; - -import java.util.List; - import org.violetmoon.quark.addons.oddities.util.Influence; import org.violetmoon.quark.content.client.tooltip.EnchantedBookTooltips; import org.violetmoon.quark.content.experimental.module.EnchantmentsBegoneModule; import org.violetmoon.quark.content.tools.module.ColorRunesModule; import org.violetmoon.zeta.util.ItemNBTHelper; +import java.util.List; + public class InfluenceEntry implements IRecipeCategoryExtension { private final ItemStack candleStack; diff --git a/src/main/java/org/violetmoon/quark/integration/jei/QuarkJeiPlugin.java b/src/main/java/org/violetmoon/quark/integration/jei/QuarkJeiPlugin.java index 563177e735..8e72fe3d05 100644 --- a/src/main/java/org/violetmoon/quark/integration/jei/QuarkJeiPlugin.java +++ b/src/main/java/org/violetmoon/quark/integration/jei/QuarkJeiPlugin.java @@ -1,42 +1,6 @@ package org.violetmoon.quark.integration.jei; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; -import org.violetmoon.quark.addons.oddities.client.screen.BackpackInventoryScreen; -import org.violetmoon.quark.addons.oddities.client.screen.CrateScreen; -import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; -import org.violetmoon.quark.addons.oddities.util.Influence; -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.client.handler.RequiredModTooltipHandler; -import org.violetmoon.quark.base.handler.GeneralConfig; -import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.base.item.QuarkItem; -import org.violetmoon.quark.content.building.module.VariantFurnacesModule; -import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; -import org.violetmoon.quark.content.client.tooltip.EnchantedBookTooltips; -import org.violetmoon.quark.content.tools.item.AncientTomeItem; -import org.violetmoon.quark.content.tools.module.AncientTomesModule; -import org.violetmoon.quark.content.tools.module.ColorRunesModule; -import org.violetmoon.quark.content.tools.module.PickarangModule; -import org.violetmoon.quark.content.tweaks.module.DiamondRepairModule; -import org.violetmoon.quark.content.tweaks.recipe.ElytraDuplicationRecipe; -import org.violetmoon.quark.content.tweaks.recipe.SlabToBlockRecipe; -import org.violetmoon.zeta.event.play.loading.ZGatherHints; -import org.violetmoon.zeta.module.IDisableable; -import org.violetmoon.zeta.util.ItemNBTHelper; -import org.violetmoon.zeta.util.RegistryUtil; - import com.google.common.collect.Sets; - import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.RecipeTypes; @@ -46,13 +10,7 @@ import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.recipe.vanilla.IJeiAnvilRecipe; import mezz.jei.api.recipe.vanilla.IVanillaRecipeFactory; -import mezz.jei.api.registration.IGuiHandlerRegistration; -import mezz.jei.api.registration.IRecipeCatalystRegistration; -import mezz.jei.api.registration.IRecipeCategoryRegistration; -import mezz.jei.api.registration.IRecipeRegistration; -import mezz.jei.api.registration.IRecipeTransferRegistration; -import mezz.jei.api.registration.ISubtypeRegistration; -import mezz.jei.api.registration.IVanillaCategoryExtensionRegistration; +import mezz.jei.api.registration.*; import mezz.jei.api.runtime.IJeiRuntime; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Rect2i; @@ -63,14 +21,7 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.RandomSource; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.EnchantedBookItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.PotionItem; -import net.minecraft.world.item.TippedArrowItem; +import net.minecraft.world.item.*; import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.PotionUtils; import net.minecraft.world.item.enchantment.Enchantment; @@ -79,6 +30,35 @@ import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import org.violetmoon.quark.addons.oddities.block.be.MatrixEnchantingTableBlockEntity; +import org.violetmoon.quark.addons.oddities.client.screen.BackpackInventoryScreen; +import org.violetmoon.quark.addons.oddities.client.screen.CrateScreen; +import org.violetmoon.quark.addons.oddities.module.MatrixEnchantingModule; +import org.violetmoon.quark.addons.oddities.util.Influence; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.client.handler.RequiredModTooltipHandler; +import org.violetmoon.quark.base.handler.GeneralConfig; +import org.violetmoon.quark.base.handler.MiscUtil; +import org.violetmoon.quark.base.item.QuarkItem; +import org.violetmoon.quark.content.building.module.VariantFurnacesModule; +import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; +import org.violetmoon.quark.content.client.tooltip.EnchantedBookTooltips; +import org.violetmoon.quark.content.tools.item.AncientTomeItem; +import org.violetmoon.quark.content.tools.module.AncientTomesModule; +import org.violetmoon.quark.content.tools.module.ColorRunesModule; +import org.violetmoon.quark.content.tools.module.PickarangModule; +import org.violetmoon.quark.content.tweaks.module.DiamondRepairModule; +import org.violetmoon.quark.content.tweaks.recipe.ElytraDuplicationRecipe; +import org.violetmoon.quark.content.tweaks.recipe.SlabToBlockRecipe; +import org.violetmoon.zeta.event.play.loading.ZGatherHints; +import org.violetmoon.zeta.module.IDisableable; +import org.violetmoon.zeta.util.ItemNBTHelper; +import org.violetmoon.zeta.util.RegistryUtil; + +import javax.annotation.Nonnull; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; @JeiPlugin public class QuarkJeiPlugin implements IModPlugin { diff --git a/src/main/java/org/violetmoon/quark/integration/jei/SlabToBlockExtension.java b/src/main/java/org/violetmoon/quark/integration/jei/SlabToBlockExtension.java index 170fdbd2f0..8d8e9a691f 100644 --- a/src/main/java/org/violetmoon/quark/integration/jei/SlabToBlockExtension.java +++ b/src/main/java/org/violetmoon/quark/integration/jei/SlabToBlockExtension.java @@ -1,15 +1,5 @@ package org.violetmoon.quark.integration.jei; -import java.util.Arrays; -import java.util.List; -import java.util.Map.Entry; - -import javax.annotation.Nonnull; - -import org.apache.commons.compress.utils.Lists; -import org.violetmoon.quark.content.tweaks.module.SlabsToBlocksModule; -import org.violetmoon.quark.content.tweaks.recipe.SlabToBlockRecipe; - import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.builder.IRecipeSlotBuilder; import mezz.jei.api.gui.ingredient.ICraftingGridHelper; @@ -18,6 +8,14 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import org.apache.commons.compress.utils.Lists; +import org.violetmoon.quark.content.tweaks.module.SlabsToBlocksModule; +import org.violetmoon.quark.content.tweaks.recipe.SlabToBlockRecipe; + +import javax.annotation.Nonnull; +import java.util.Arrays; +import java.util.List; +import java.util.Map.Entry; public record SlabToBlockExtension(SlabToBlockRecipe recipe) implements ICraftingCategoryExtension { diff --git a/src/main/java/org/violetmoon/quark/integration/lootr/ILootrIntegration.java b/src/main/java/org/violetmoon/quark/integration/lootr/ILootrIntegration.java index 38d6796aed..8ce328f5f6 100644 --- a/src/main/java/org/violetmoon/quark/integration/lootr/ILootrIntegration.java +++ b/src/main/java/org/violetmoon/quark/integration/lootr/ILootrIntegration.java @@ -7,11 +7,10 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.ModList; +import org.violetmoon.zeta.client.event.load.ZPreTextureStitch; import javax.annotation.Nullable; -import org.violetmoon.zeta.client.event.load.ZPreTextureStitch; - /** * @author WireSegal * Created at 11:40 AM on 7/3/23. diff --git a/src/main/java/org/violetmoon/quark/integration/lootr/LootrIntegration.java b/src/main/java/org/violetmoon/quark/integration/lootr/LootrIntegration.java index 91a22bbf05..464e53d3ee 100644 --- a/src/main/java/org/violetmoon/quark/integration/lootr/LootrIntegration.java +++ b/src/main/java/org/violetmoon/quark/integration/lootr/LootrIntegration.java @@ -8,21 +8,19 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import noobanidus.mods.lootr.init.ModBlocks; - -import javax.annotation.Nullable; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.building.module.VariantChestsModule; import org.violetmoon.quark.integration.lootr.client.LootrVariantChestRenderer; import org.violetmoon.zeta.client.event.load.ZPreTextureStitch; -import static org.violetmoon.quark.content.building.module.VariantChestsModule.registerChests; - +import javax.annotation.Nullable; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import static org.violetmoon.quark.content.building.module.VariantChestsModule.registerChests; + /** * @author WireSegal * Created at 11:40 AM on 7/3/23. diff --git a/src/main/java/org/violetmoon/quark/integration/lootr/LootrVariantChestBlock.java b/src/main/java/org/violetmoon/quark/integration/lootr/LootrVariantChestBlock.java index 361729978c..158a8ce744 100644 --- a/src/main/java/org/violetmoon/quark/integration/lootr/LootrVariantChestBlock.java +++ b/src/main/java/org/violetmoon/quark/integration/lootr/LootrVariantChestBlock.java @@ -44,14 +44,12 @@ import noobanidus.mods.lootr.block.entities.LootrChestBlockEntity; import noobanidus.mods.lootr.config.ConfigManager; import noobanidus.mods.lootr.util.ChestUtil; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.content.building.block.VariantChestBlock; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.IZetaItemPropertiesFiller; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/src/main/java/org/violetmoon/quark/integration/lootr/LootrVariantTrappedChestBlock.java b/src/main/java/org/violetmoon/quark/integration/lootr/LootrVariantTrappedChestBlock.java index b758af288f..0b756faae8 100644 --- a/src/main/java/org/violetmoon/quark/integration/lootr/LootrVariantTrappedChestBlock.java +++ b/src/main/java/org/violetmoon/quark/integration/lootr/LootrVariantTrappedChestBlock.java @@ -27,13 +27,11 @@ import noobanidus.mods.lootr.block.entities.LootrChestBlockEntity; import noobanidus.mods.lootr.config.ConfigManager; import noobanidus.mods.lootr.util.ChestUtil; - -import javax.annotation.Nullable; - import org.violetmoon.quark.content.building.block.VariantTrappedChestBlock; import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.registry.IZetaItemPropertiesFiller; +import javax.annotation.Nullable; import java.util.function.Supplier; /** diff --git a/src/main/java/org/violetmoon/quark/integration/lootr/client/LootrVariantChestRenderer.java b/src/main/java/org/violetmoon/quark/integration/lootr/client/LootrVariantChestRenderer.java index 10cd350779..dd2696086e 100644 --- a/src/main/java/org/violetmoon/quark/integration/lootr/client/LootrVariantChestRenderer.java +++ b/src/main/java/org/violetmoon/quark/integration/lootr/client/LootrVariantChestRenderer.java @@ -8,17 +8,16 @@ import net.minecraft.world.level.block.state.properties.ChestType; import noobanidus.mods.lootr.config.ConfigManager; import noobanidus.mods.lootr.util.Getter; - -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.client.render.GenericChestBERenderer; import org.violetmoon.quark.content.building.module.VariantChestsModule; import org.violetmoon.quark.integration.lootr.LootrVariantChestBlockEntity; import org.violetmoon.zeta.client.event.load.ZPreTextureStitch; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + public class LootrVariantChestRenderer extends GenericChestBERenderer { private UUID playerId = null; private static final Map chestTextures = new HashMap<>(); diff --git a/src/main/java/org/violetmoon/quark/integration/terrablender/TerraBlenderIntegration.java b/src/main/java/org/violetmoon/quark/integration/terrablender/TerraBlenderIntegration.java index 29dae2d4d5..0a8baa5e19 100644 --- a/src/main/java/org/violetmoon/quark/integration/terrablender/TerraBlenderIntegration.java +++ b/src/main/java/org/violetmoon/quark/integration/terrablender/TerraBlenderIntegration.java @@ -1,17 +1,6 @@ package org.violetmoon.quark.integration.terrablender; -import java.util.function.Consumer; -import java.util.function.Supplier; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.handler.GeneralConfig; -import org.violetmoon.quark.base.handler.UndergroundBiomeHandler; -import org.violetmoon.quark.base.handler.UndergroundBiomeHandler.Proxy; -import org.violetmoon.quark.base.handler.UndergroundBiomeHandler.UndergroundBiomeSkeleton; -import org.violetmoon.zeta.event.load.ZLoadComplete; - import com.mojang.datafixers.util.Pair; - import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -19,12 +8,19 @@ import net.minecraft.world.level.biome.Climate; import net.minecraft.world.level.biome.Climate.ParameterPoint; import net.minecraft.world.level.biome.OverworldBiomeBuilder; -import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; -import net.minecraftforge.fml.event.lifecycle.ParallelDispatchEvent; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.handler.GeneralConfig; +import org.violetmoon.quark.base.handler.UndergroundBiomeHandler; +import org.violetmoon.quark.base.handler.UndergroundBiomeHandler.Proxy; +import org.violetmoon.quark.base.handler.UndergroundBiomeHandler.UndergroundBiomeSkeleton; +import org.violetmoon.zeta.event.load.ZLoadComplete; import terrablender.api.Region; import terrablender.api.RegionType; import terrablender.api.Regions; +import java.util.function.Consumer; +import java.util.function.Supplier; + public class TerraBlenderIntegration implements Supplier { private TBProxy proxy; diff --git a/src/main/java/org/violetmoon/quark/mixin/BannerDuplicateRecipeMixin.java b/src/main/java/org/violetmoon/quark/mixin/BannerDuplicateRecipeMixin.java index dedfa536c0..7d366ec3cf 100644 --- a/src/main/java/org/violetmoon/quark/mixin/BannerDuplicateRecipeMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/BannerDuplicateRecipeMixin.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.mixin; +import net.minecraft.world.item.crafting.BannerDuplicateRecipe; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.violetmoon.quark.content.tweaks.module.MoreBannerLayersModule; -import net.minecraft.world.item.crafting.BannerDuplicateRecipe; - @Mixin(BannerDuplicateRecipe.class) public class BannerDuplicateRecipeMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/BeaconBlockEntityMixin.java b/src/main/java/org/violetmoon/quark/mixin/BeaconBlockEntityMixin.java index 83459630e2..0be5f91ea4 100644 --- a/src/main/java/org/violetmoon/quark/mixin/BeaconBlockEntityMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/BeaconBlockEntityMixin.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.mixin; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; -import org.violetmoon.quark.content.tools.module.BeaconRedirectionModule; - import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BeaconBlockEntity; import net.minecraft.world.level.block.state.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; +import org.violetmoon.quark.content.tools.module.BeaconRedirectionModule; @Mixin(BeaconBlockEntity.class) public class BeaconBlockEntityMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/DamageSourceMixin.java b/src/main/java/org/violetmoon/quark/mixin/DamageSourceMixin.java index 4cc147b0d0..5ba13fc9cf 100644 --- a/src/main/java/org/violetmoon/quark/mixin/DamageSourceMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/DamageSourceMixin.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.mixin; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.player.Player; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.violetmoon.quark.content.tools.module.PickarangModule; -import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.entity.player.Player; - @Mixin(DamageSource.class) public class DamageSourceMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/HalfTransparentBlockMixin.java b/src/main/java/org/violetmoon/quark/mixin/HalfTransparentBlockMixin.java index acefca7120..59f392b5ef 100644 --- a/src/main/java/org/violetmoon/quark/mixin/HalfTransparentBlockMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/HalfTransparentBlockMixin.java @@ -1,16 +1,15 @@ package org.violetmoon.quark.mixin; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.HalfTransparentBlock; +import net.minecraft.world.level.block.state.BlockState; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.violetmoon.quark.addons.oddities.module.PipesModule; -import net.minecraft.core.Direction; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.HalfTransparentBlock; -import net.minecraft.world.level.block.state.BlockState; - @Mixin(HalfTransparentBlock.class) public class HalfTransparentBlockMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/ItemStackMixin.java b/src/main/java/org/violetmoon/quark/mixin/ItemStackMixin.java index 1ae2f5b83e..e11c1f371a 100644 --- a/src/main/java/org/violetmoon/quark/mixin/ItemStackMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/ItemStackMixin.java @@ -30,7 +30,6 @@ import org.violetmoon.quark.content.client.hax.PseudoAccessorItemStack; import org.violetmoon.quark.content.client.module.ImprovedTooltipsModule; import org.violetmoon.quark.content.client.resources.AttributeSlot; -import org.violetmoon.quark.content.client.tooltip.AttributeTooltips; import org.violetmoon.quark.content.management.module.ItemSharingModule; import org.violetmoon.quark.content.tools.module.AncientTomesModule; import org.violetmoon.quark.content.tweaks.module.GoldToolsHaveFortuneModule; diff --git a/src/main/java/org/violetmoon/quark/mixin/LadderBlockMixin.java b/src/main/java/org/violetmoon/quark/mixin/LadderBlockMixin.java index b48d9ce3f4..ff06bd8462 100644 --- a/src/main/java/org/violetmoon/quark/mixin/LadderBlockMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/LadderBlockMixin.java @@ -1,11 +1,5 @@ package org.violetmoon.quark.mixin; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.violetmoon.quark.content.tweaks.module.EnhancedLaddersModule; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.LevelAccessor; @@ -13,6 +7,11 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.LadderBlock; import net.minecraft.world.level.block.state.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.violetmoon.quark.content.tweaks.module.EnhancedLaddersModule; @Mixin(LadderBlock.class) public class LadderBlockMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/LoomMenuMixin.java b/src/main/java/org/violetmoon/quark/mixin/LoomMenuMixin.java index 8debf9f780..717ceb1947 100644 --- a/src/main/java/org/violetmoon/quark/mixin/LoomMenuMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/LoomMenuMixin.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.mixin; +import net.minecraft.world.inventory.LoomMenu; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.violetmoon.quark.content.tweaks.module.MoreBannerLayersModule; -import net.minecraft.world.inventory.LoomMenu; - @Mixin(LoomMenu.class) public class LoomMenuMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/OverworldBiomeBuilderMixin.java b/src/main/java/org/violetmoon/quark/mixin/OverworldBiomeBuilderMixin.java index ce13d34e8a..abbb2c77d5 100644 --- a/src/main/java/org/violetmoon/quark/mixin/OverworldBiomeBuilderMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/OverworldBiomeBuilderMixin.java @@ -1,19 +1,17 @@ package org.violetmoon.quark.mixin; -import java.util.function.Consumer; - +import com.mojang.datafixers.util.Pair; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.biome.Climate; +import net.minecraft.world.level.biome.OverworldBiomeBuilder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.violetmoon.quark.base.handler.UndergroundBiomeHandler; -import com.mojang.datafixers.util.Pair; - -import net.minecraft.resources.ResourceKey; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.Climate; -import net.minecraft.world.level.biome.OverworldBiomeBuilder; +import java.util.function.Consumer; @Mixin(OverworldBiomeBuilder.class) public class OverworldBiomeBuilderMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/PlayerAdvancementsMixin.java b/src/main/java/org/violetmoon/quark/mixin/PlayerAdvancementsMixin.java index 3e549761bc..4cd1396c45 100644 --- a/src/main/java/org/violetmoon/quark/mixin/PlayerAdvancementsMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/PlayerAdvancementsMixin.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.mixin; +import net.minecraft.server.PlayerAdvancements; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.violetmoon.quark.base.handler.GeneralConfig; -import net.minecraft.server.PlayerAdvancements; - @Mixin(PlayerAdvancements.class) public class PlayerAdvancementsMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/ServerAdvancementManagerMixin.java b/src/main/java/org/violetmoon/quark/mixin/ServerAdvancementManagerMixin.java index 2cc9639396..b959f74565 100644 --- a/src/main/java/org/violetmoon/quark/mixin/ServerAdvancementManagerMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/ServerAdvancementManagerMixin.java @@ -1,13 +1,11 @@ package org.violetmoon.quark.mixin; import com.google.gson.JsonElement; - import net.minecraft.advancements.Advancement; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.ServerAdvancementManager; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.util.profiling.ProfilerFiller; - import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/org/violetmoon/quark/mixin/StructurePieceMixin.java b/src/main/java/org/violetmoon/quark/mixin/StructurePieceMixin.java index 3a28373546..20d7538d91 100644 --- a/src/main/java/org/violetmoon/quark/mixin/StructurePieceMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/StructurePieceMixin.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.mixin; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyVariable; -import org.violetmoon.quark.base.handler.StructureBlockReplacementHandler; - import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.structure.StructurePiece; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.violetmoon.quark.base.handler.StructureBlockReplacementHandler; @Mixin(StructurePiece.class) public class StructurePieceMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/StructureStartMixin.java b/src/main/java/org/violetmoon/quark/mixin/StructureStartMixin.java index 518a5b23be..ff29e6c27a 100644 --- a/src/main/java/org/violetmoon/quark/mixin/StructureStartMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/StructureStartMixin.java @@ -1,13 +1,5 @@ package org.violetmoon.quark.mixin; -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.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.violetmoon.quark.base.handler.StructureBlockReplacementHandler; - import net.minecraft.util.RandomSource; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.StructureManager; @@ -17,6 +9,13 @@ import net.minecraft.world.level.levelgen.structure.Structure; import net.minecraft.world.level.levelgen.structure.StructureStart; import net.minecraft.world.level.levelgen.structure.pieces.PiecesContainer; +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.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.violetmoon.quark.base.handler.StructureBlockReplacementHandler; @Mixin(StructureStart.class) public class StructureStartMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/StructureTemplateMixin.java b/src/main/java/org/violetmoon/quark/mixin/StructureTemplateMixin.java index 32a7a97935..50f2be1288 100644 --- a/src/main/java/org/violetmoon/quark/mixin/StructureTemplateMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/StructureTemplateMixin.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.mixin; +import net.minecraft.world.level.ServerLevelAccessor; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.violetmoon.quark.base.handler.StructureBlockReplacementHandler; -import net.minecraft.world.level.ServerLevelAccessor; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; - @Mixin(StructureTemplate.class) public class StructureTemplateMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/BannerItemMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/BannerItemMixin.java index e80360cda4..b4ca3b0625 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/BannerItemMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/BannerItemMixin.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.mixin.client; +import net.minecraft.world.item.BannerItem; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.violetmoon.quark.content.tweaks.module.MoreBannerLayersModule; -import net.minecraft.world.item.BannerItem; - @Mixin(BannerItem.class) public class BannerItemMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/BeaconTileEntityRendererMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/BeaconTileEntityRendererMixin.java index 6eb4c843ad..ea1768dcd3 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/BeaconTileEntityRendererMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/BeaconTileEntityRendererMixin.java @@ -1,17 +1,15 @@ package org.violetmoon.quark.mixin.client; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BeaconRenderer; +import net.minecraft.world.level.block.entity.BeaconBlockEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.violetmoon.quark.content.tools.client.render.QuarkBeaconBlockEntityRenderer; -import com.mojang.blaze3d.vertex.PoseStack; - -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.blockentity.BeaconRenderer; -import net.minecraft.world.level.block.entity.BeaconBlockEntity; - @Mixin(BeaconRenderer.class) public class BeaconTileEntityRendererMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/ContainerScreenMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/ContainerScreenMixin.java index 3a75dae851..05370f0f1e 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/ContainerScreenMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/ContainerScreenMixin.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.mixin.client; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.violetmoon.quark.content.management.module.EasyTransferingModule; -import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; - @Mixin(AbstractContainerScreen.class) public class ContainerScreenMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/ForgeGuiMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/ForgeGuiMixin.java index 08a56697f2..35a05a8cb0 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/ForgeGuiMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/ForgeGuiMixin.java @@ -1,13 +1,12 @@ package org.violetmoon.quark.mixin.client; +import net.minecraftforge.client.gui.overlay.ForgeGui; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.client.module.ElytraIndicatorModule; -import net.minecraftforge.client.gui.overlay.ForgeGui; - @Mixin(ForgeGui.class) public class ForgeGuiMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/HumanoidArmorLayerMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/HumanoidArmorLayerMixin.java index cf0d7edb2f..8056da3845 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/HumanoidArmorLayerMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/HumanoidArmorLayerMixin.java @@ -1,16 +1,15 @@ package org.violetmoon.quark.mixin.client; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.violetmoon.quark.content.tools.module.ColorRunesModule; - import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.violetmoon.quark.content.tools.module.ColorRunesModule; @Mixin(HumanoidArmorLayer.class) public class HumanoidArmorLayerMixin, A extends HumanoidModel> { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/HumanoidModelMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/HumanoidModelMixin.java index d31c9eb59d..51970ede04 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/HumanoidModelMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/HumanoidModelMixin.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.mixin.client; +import net.minecraft.client.model.HumanoidModel; +import net.minecraft.world.entity.LivingEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.violetmoon.quark.content.tweaks.client.emote.EmoteHandler; -import net.minecraft.client.model.HumanoidModel; -import net.minecraft.world.entity.LivingEntity; - @Mixin(HumanoidModel.class) public class HumanoidModelMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/ItemInHandRendererMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/ItemInHandRendererMixin.java index c6cffdfd9c..0e30395125 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/ItemInHandRendererMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/ItemInHandRendererMixin.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.mixin.client; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.ItemInHandRenderer; +import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.violetmoon.quark.content.experimental.module.VariantSelectorModule; -import net.minecraft.client.player.AbstractClientPlayer; -import net.minecraft.client.renderer.ItemInHandRenderer; -import net.minecraft.world.item.ItemStack; - @Mixin(ItemInHandRenderer.class) public class ItemInHandRendererMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/JukeboxBlockEntityMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/JukeboxBlockEntityMixin.java index 237717173c..5e1c46d636 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/JukeboxBlockEntityMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/JukeboxBlockEntityMixin.java @@ -1,14 +1,13 @@ package org.violetmoon.quark.mixin.client; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.block.entity.JukeboxBlockEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.violetmoon.quark.content.tools.module.AmbientDiscsModule; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.block.entity.JukeboxBlockEntity; - @Mixin(JukeboxBlockEntity.class) public class JukeboxBlockEntityMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/LoomScreenMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/LoomScreenMixin.java index b18ecf9492..b2f5de55ec 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/LoomScreenMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/LoomScreenMixin.java @@ -1,12 +1,11 @@ package org.violetmoon.quark.mixin.client; +import net.minecraft.client.gui.screens.inventory.LoomScreen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.violetmoon.quark.content.tweaks.module.MoreBannerLayersModule; -import net.minecraft.client.gui.screens.inventory.LoomScreen; - @Mixin(LoomScreen.class) public class LoomScreenMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/MinecartSoundInstanceMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/MinecartSoundInstanceMixin.java index 41c2f3ec29..523c081559 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/MinecartSoundInstanceMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/MinecartSoundInstanceMixin.java @@ -1,5 +1,7 @@ package org.violetmoon.quark.mixin.client; +import net.minecraft.client.resources.sounds.MinecartSoundInstance; +import net.minecraft.world.entity.vehicle.AbstractMinecart; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -8,9 +10,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.violetmoon.quark.content.client.module.WoolShutsUpMinecartsModule; -import net.minecraft.client.resources.sounds.MinecartSoundInstance; -import net.minecraft.world.entity.vehicle.AbstractMinecart; - @Mixin(MinecartSoundInstance.class) public class MinecartSoundInstanceMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/MinecraftMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/MinecraftMixin.java index 1610853b61..c7bae9d822 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/MinecraftMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/MinecraftMixin.java @@ -2,6 +2,7 @@ import com.llamalad7.mixinextras.sugar.Share; import com.llamalad7.mixinextras.sugar.ref.LocalRef; +import net.minecraft.client.Minecraft; import net.minecraft.world.phys.HitResult; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -11,8 +12,6 @@ import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.client.module.LongRangePickBlockModule; -import net.minecraft.client.Minecraft; - import javax.annotation.Nullable; @Mixin(Minecraft.class) diff --git a/src/main/java/org/violetmoon/quark/mixin/client/PistonTileEntityRendererMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/PistonTileEntityRendererMixin.java index b54b128a0c..15de09f427 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/PistonTileEntityRendererMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/PistonTileEntityRendererMixin.java @@ -1,17 +1,15 @@ package org.violetmoon.quark.mixin.client; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.PistonHeadRenderer; +import net.minecraft.world.level.block.piston.PistonMovingBlockEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.violetmoon.quark.content.automation.client.render.QuarkPistonBlockEntityRenderer; -import com.mojang.blaze3d.vertex.PoseStack; - -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.blockentity.PistonHeadRenderer; -import net.minecraft.world.level.block.piston.PistonMovingBlockEntity; - @Mixin(PistonHeadRenderer.class) public class PistonTileEntityRendererMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/RenderBuffersMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/RenderBuffersMixin.java index 8550716bcb..715bac4553 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/RenderBuffersMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/RenderBuffersMixin.java @@ -1,17 +1,15 @@ package org.violetmoon.quark.mixin.client; +import com.mojang.blaze3d.vertex.BufferBuilder; +import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; +import net.minecraft.client.renderer.RenderBuffers; +import net.minecraft.client.renderer.RenderType; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.violetmoon.quark.content.tools.client.render.GlintRenderTypes; -import com.mojang.blaze3d.vertex.BufferBuilder; - -import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; -import net.minecraft.client.renderer.RenderBuffers; -import net.minecraft.client.renderer.RenderType; - @Mixin(RenderBuffers.class) public class RenderBuffersMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/ThrownTridentRendererMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/ThrownTridentRendererMixin.java index 28338b8faa..4f8de1dda3 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/ThrownTridentRendererMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/ThrownTridentRendererMixin.java @@ -1,17 +1,15 @@ package org.violetmoon.quark.mixin.client; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.entity.ThrownTridentRenderer; +import net.minecraft.world.entity.projectile.ThrownTrident; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.violetmoon.quark.content.tools.module.ColorRunesModule; -import com.mojang.blaze3d.vertex.PoseStack; - -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.entity.ThrownTridentRenderer; -import net.minecraft.world.entity.projectile.ThrownTrident; - @Mixin(ThrownTridentRenderer.class) public class ThrownTridentRendererMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/variants/ChickenRendererMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/variants/ChickenRendererMixin.java index 11b306da64..8ef1961c70 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/variants/ChickenRendererMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/variants/ChickenRendererMixin.java @@ -1,5 +1,9 @@ package org.violetmoon.quark.mixin.client.variants; +import net.minecraft.client.model.ChickenModel; +import net.minecraft.client.renderer.entity.ChickenRenderer; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.animal.Chicken; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -7,11 +11,6 @@ import org.violetmoon.quark.content.client.module.VariantAnimalTexturesModule; import org.violetmoon.quark.content.tweaks.module.GrabChickensModule; -import net.minecraft.client.model.ChickenModel; -import net.minecraft.client.renderer.entity.ChickenRenderer; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.animal.Chicken; - @Mixin(ChickenRenderer.class) public class ChickenRendererMixin { diff --git a/src/main/java/org/violetmoon/quark/mixin/client/variants/SlimeRendererMixin.java b/src/main/java/org/violetmoon/quark/mixin/client/variants/SlimeRendererMixin.java index 15a41b4f70..7c78547c76 100644 --- a/src/main/java/org/violetmoon/quark/mixin/client/variants/SlimeRendererMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/client/variants/SlimeRendererMixin.java @@ -1,15 +1,14 @@ package org.violetmoon.quark.mixin.client.variants; +import net.minecraft.client.renderer.entity.SlimeRenderer; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.monster.Slime; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.violetmoon.quark.content.client.module.VariantAnimalTexturesModule; -import net.minecraft.client.renderer.entity.SlimeRenderer; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.monster.Slime; - @Mixin(SlimeRenderer.class) public class SlimeRendererMixin { diff --git a/src/main/java/org/violetmoon/zeta/Zeta.java b/src/main/java/org/violetmoon/zeta/Zeta.java index 6e57da896a..33ee2b5d09 100644 --- a/src/main/java/org/violetmoon/zeta/Zeta.java +++ b/src/main/java/org/violetmoon/zeta/Zeta.java @@ -12,21 +12,13 @@ import org.violetmoon.zeta.config.ConfigManager; import org.violetmoon.zeta.config.IZetaConfigInternals; import org.violetmoon.zeta.config.SectionDefinition; -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.bus.ZetaEventBus; +import org.violetmoon.zeta.event.bus.*; import org.violetmoon.zeta.item.ext.ItemExtensionFactory; import org.violetmoon.zeta.module.ModuleFinder; import org.violetmoon.zeta.module.ZetaCategory; import org.violetmoon.zeta.module.ZetaModuleManager; import org.violetmoon.zeta.network.ZetaNetworkHandler; -import org.violetmoon.zeta.registry.BrewingRegistry; -import org.violetmoon.zeta.registry.CraftingExtensionsRegistry; -import org.violetmoon.zeta.registry.DyeablesRegistry; -import org.violetmoon.zeta.registry.RenderLayerRegistry; -import org.violetmoon.zeta.registry.ZetaRegistry; +import org.violetmoon.zeta.registry.*; import org.violetmoon.zeta.util.ZetaSide; /** diff --git a/src/main/java/org/violetmoon/zeta/block/ext/IZetaBlockExtensions.java b/src/main/java/org/violetmoon/zeta/block/ext/IZetaBlockExtensions.java index ad7d88bf92..6c62124776 100644 --- a/src/main/java/org/violetmoon/zeta/block/ext/IZetaBlockExtensions.java +++ b/src/main/java/org/violetmoon/zeta/block/ext/IZetaBlockExtensions.java @@ -1,36 +1,22 @@ package org.violetmoon.zeta.block.ext; -import java.util.Optional; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.tags.BlockTags; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.AxeItem; -import net.minecraft.world.item.HoneycombItem; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.ShovelItem; +import net.minecraft.world.item.*; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.BeaconBeamBlock; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.FenceGateBlock; -import net.minecraft.world.level.block.FireBlock; -import net.minecraft.world.level.block.HalfTransparentBlock; -import net.minecraft.world.level.block.LadderBlock; -import net.minecraft.world.level.block.LeavesBlock; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.TrapDoorBlock; -import net.minecraft.world.level.block.WeatheringCopper; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.FluidState; import org.jetbrains.annotations.Nullable; +import java.util.Optional; + /** * Imagine a mouse eating a suspiciously IForgeBlock-shaped piece of cheese */ diff --git a/src/main/java/org/violetmoon/zeta/client/AlikeColorHandler.java b/src/main/java/org/violetmoon/zeta/client/AlikeColorHandler.java index b6d83b7cfc..49a7d9a7b8 100644 --- a/src/main/java/org/violetmoon/zeta/client/AlikeColorHandler.java +++ b/src/main/java/org/violetmoon/zeta/client/AlikeColorHandler.java @@ -1,7 +1,5 @@ package org.violetmoon.zeta.client; -import java.util.function.Function; - import net.minecraft.client.Minecraft; import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.item.ItemColor; @@ -13,6 +11,8 @@ import net.minecraft.world.level.block.state.BlockState; import org.jetbrains.annotations.Nullable; +import java.util.function.Function; + /** * A BlockColor and ItemColor that just mimics another block. */ diff --git a/src/main/java/org/violetmoon/zeta/client/ClientRegistryExtension.java b/src/main/java/org/violetmoon/zeta/client/ClientRegistryExtension.java index 660f0a67b6..167b6b6744 100644 --- a/src/main/java/org/violetmoon/zeta/client/ClientRegistryExtension.java +++ b/src/main/java/org/violetmoon/zeta/client/ClientRegistryExtension.java @@ -1,9 +1,13 @@ package org.violetmoon.zeta.client; -import java.util.EnumMap; -import java.util.Map; -import java.util.function.Function; - +import net.minecraft.client.color.block.BlockColor; +import net.minecraft.client.color.item.ItemColor; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.item.ClampedItemPropertyFunction; +import net.minecraft.client.renderer.item.ItemProperties; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; import org.violetmoon.zeta.Zeta; import org.violetmoon.zeta.client.event.load.ZAddBlockColorHandlers; import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers; @@ -13,14 +17,9 @@ import org.violetmoon.zeta.registry.RenderLayerRegistry; import org.violetmoon.zeta.registry.ZetaRegistry; -import net.minecraft.client.color.block.BlockColor; -import net.minecraft.client.color.item.ItemColor; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.item.ClampedItemPropertyFunction; -import net.minecraft.client.renderer.item.ItemProperties; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; +import java.util.EnumMap; +import java.util.Map; +import java.util.function.Function; /** * Just a grab-bag of stuff that needs to be done on the physical client diff --git a/src/main/java/org/violetmoon/zeta/client/ClientTicker.java b/src/main/java/org/violetmoon/zeta/client/ClientTicker.java index 33f0d20179..487c776667 100644 --- a/src/main/java/org/violetmoon/zeta/client/ClientTicker.java +++ b/src/main/java/org/violetmoon/zeta/client/ClientTicker.java @@ -1,12 +1,11 @@ package org.violetmoon.zeta.client; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; import org.violetmoon.zeta.client.event.play.ZEndClientTick; import org.violetmoon.zeta.client.event.play.ZRenderTick; import org.violetmoon.zeta.event.bus.PlayEvent; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.Screen; - public final class ClientTicker { public int ticksInGame = 0; public float partialTicks = 0; diff --git a/src/main/java/org/violetmoon/zeta/client/TopLayerTooltipHandler.java b/src/main/java/org/violetmoon/zeta/client/TopLayerTooltipHandler.java index 87d0bad07e..611660296b 100644 --- a/src/main/java/org/violetmoon/zeta/client/TopLayerTooltipHandler.java +++ b/src/main/java/org/violetmoon/zeta/client/TopLayerTooltipHandler.java @@ -1,18 +1,16 @@ package org.violetmoon.zeta.client; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.violetmoon.zeta.client.event.play.ZRenderTick; -import org.violetmoon.zeta.event.bus.PlayEvent; - import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; +import org.violetmoon.zeta.client.event.play.ZRenderTick; +import org.violetmoon.zeta.event.bus.PlayEvent; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; public class TopLayerTooltipHandler { diff --git a/src/main/java/org/violetmoon/zeta/client/config/ClientConfigManager.java b/src/main/java/org/violetmoon/zeta/client/config/ClientConfigManager.java index ced58c7744..9a3d071725 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/ClientConfigManager.java +++ b/src/main/java/org/violetmoon/zeta/client/config/ClientConfigManager.java @@ -1,23 +1,15 @@ package org.violetmoon.zeta.client.config; -import java.util.List; - import org.jetbrains.annotations.NotNull; import org.violetmoon.quark.base.config.type.inputtable.ConvulsionMatrixConfig; import org.violetmoon.quark.base.config.type.inputtable.RGBColorConfig; -import org.violetmoon.zeta.client.config.definition.BooleanClientDefinition; -import org.violetmoon.zeta.client.config.definition.ClientDefinitionExt; -import org.violetmoon.zeta.client.config.definition.ConvulsionMatrixClientDefinition; -import org.violetmoon.zeta.client.config.definition.DoubleClientDefinition; -import org.violetmoon.zeta.client.config.definition.IntegerClientDefinition; -import org.violetmoon.zeta.client.config.definition.RGBClientDefinition; -import org.violetmoon.zeta.client.config.definition.SectionClientDefinition; -import org.violetmoon.zeta.client.config.definition.StringClientDefinition; -import org.violetmoon.zeta.client.config.definition.StringListClientDefinition; +import org.violetmoon.zeta.client.config.definition.*; import org.violetmoon.zeta.config.Definition; import org.violetmoon.zeta.config.SectionDefinition; import org.violetmoon.zeta.config.ValueDefinition; +import java.util.List; + public class ClientConfigManager { @SuppressWarnings("unchecked") public @NotNull ClientDefinitionExt getExt(D def) { diff --git a/src/main/java/org/violetmoon/zeta/client/config/definition/BooleanClientDefinition.java b/src/main/java/org/violetmoon/zeta/client/config/definition/BooleanClientDefinition.java index 13bfa68fb4..32b977f77c 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/definition/BooleanClientDefinition.java +++ b/src/main/java/org/violetmoon/zeta/client/config/definition/BooleanClientDefinition.java @@ -1,14 +1,13 @@ package org.violetmoon.zeta.client.config.definition; -import java.util.function.Consumer; - +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.screens.Screen; import org.violetmoon.zeta.client.ZetaClient; import org.violetmoon.zeta.client.config.widget.CheckboxButton; import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.ValueDefinition; -import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.screens.Screen; +import java.util.function.Consumer; public class BooleanClientDefinition implements ClientDefinitionExt> { @Override diff --git a/src/main/java/org/violetmoon/zeta/client/config/definition/ClientDefinitionExt.java b/src/main/java/org/violetmoon/zeta/client/config/definition/ClientDefinitionExt.java index fe69f79155..fa024436c2 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/definition/ClientDefinitionExt.java +++ b/src/main/java/org/violetmoon/zeta/client/config/definition/ClientDefinitionExt.java @@ -1,15 +1,14 @@ package org.violetmoon.zeta.client.config.definition; -import java.util.function.Consumer; - +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.resources.language.I18n; import org.violetmoon.zeta.client.ZetaClient; import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.Definition; import org.violetmoon.zeta.config.SectionDefinition; -import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.resources.language.I18n; +import java.util.function.Consumer; public interface ClientDefinitionExt { default String getGuiDisplayName(ChangeSet changes, T def) { diff --git a/src/main/java/org/violetmoon/zeta/client/config/definition/ConvulsionMatrixClientDefinition.java b/src/main/java/org/violetmoon/zeta/client/config/definition/ConvulsionMatrixClientDefinition.java index 48d78c461c..c8faa82993 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/definition/ConvulsionMatrixClientDefinition.java +++ b/src/main/java/org/violetmoon/zeta/client/config/definition/ConvulsionMatrixClientDefinition.java @@ -1,21 +1,5 @@ package org.violetmoon.zeta.client.config.definition; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Nonnull; - -import org.violetmoon.quark.base.config.type.inputtable.ConvulsionMatrixConfig; -import org.violetmoon.zeta.client.ZetaClient; -import org.violetmoon.zeta.client.config.screen.AbstractSectionInputScreen; -import org.violetmoon.zeta.client.config.widget.PencilButton; -import org.violetmoon.zeta.config.ChangeSet; -import org.violetmoon.zeta.config.SectionDefinition; -import org.violetmoon.zeta.config.ValueDefinition; - import com.google.common.base.Preconditions; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; @@ -28,6 +12,20 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraftforge.client.gui.widget.ForgeSlider; +import org.violetmoon.quark.base.config.type.inputtable.ConvulsionMatrixConfig; +import org.violetmoon.zeta.client.ZetaClient; +import org.violetmoon.zeta.client.config.screen.AbstractSectionInputScreen; +import org.violetmoon.zeta.client.config.widget.PencilButton; +import org.violetmoon.zeta.config.ChangeSet; +import org.violetmoon.zeta.config.SectionDefinition; +import org.violetmoon.zeta.config.ValueDefinition; + +import javax.annotation.Nonnull; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; +import java.util.stream.Collectors; +import java.util.stream.Stream; public class ConvulsionMatrixClientDefinition implements ClientDefinitionExt { public ConvulsionMatrixClientDefinition(ConvulsionMatrixConfig cfg, SectionDefinition def) { diff --git a/src/main/java/org/violetmoon/zeta/client/config/definition/DoubleClientDefinition.java b/src/main/java/org/violetmoon/zeta/client/config/definition/DoubleClientDefinition.java index 42caa8da33..fbf0ee90ae 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/definition/DoubleClientDefinition.java +++ b/src/main/java/org/violetmoon/zeta/client/config/definition/DoubleClientDefinition.java @@ -1,7 +1,5 @@ package org.violetmoon.zeta.client.config.definition; -import java.util.function.Consumer; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.screens.Screen; @@ -12,6 +10,8 @@ import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.ValueDefinition; +import java.util.function.Consumer; + public class DoubleClientDefinition implements ClientDefinitionExt> { @Override public String getSubtitle(ChangeSet changes, ValueDefinition def) { diff --git a/src/main/java/org/violetmoon/zeta/client/config/definition/IntegerClientDefinition.java b/src/main/java/org/violetmoon/zeta/client/config/definition/IntegerClientDefinition.java index e8b06f1516..ee86807da2 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/definition/IntegerClientDefinition.java +++ b/src/main/java/org/violetmoon/zeta/client/config/definition/IntegerClientDefinition.java @@ -1,7 +1,5 @@ package org.violetmoon.zeta.client.config.definition; -import java.util.function.Consumer; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.screens.Screen; @@ -12,6 +10,8 @@ import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.ValueDefinition; +import java.util.function.Consumer; + public class IntegerClientDefinition implements ClientDefinitionExt> { @Override public String getSubtitle(ChangeSet changes, ValueDefinition def) { diff --git a/src/main/java/org/violetmoon/zeta/client/config/definition/RGBClientDefinition.java b/src/main/java/org/violetmoon/zeta/client/config/definition/RGBClientDefinition.java index 32134f3a5e..cd62ff4a8a 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/definition/RGBClientDefinition.java +++ b/src/main/java/org/violetmoon/zeta/client/config/definition/RGBClientDefinition.java @@ -1,9 +1,5 @@ package org.violetmoon.zeta.client.config.definition; -import java.util.function.Consumer; - -import javax.annotation.Nonnull; - import com.google.common.base.Preconditions; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; @@ -21,6 +17,9 @@ import org.violetmoon.zeta.config.SectionDefinition; import org.violetmoon.zeta.config.ValueDefinition; +import javax.annotation.Nonnull; +import java.util.function.Consumer; + public class RGBClientDefinition implements ClientDefinitionExt { protected final ValueDefinition r; protected final ValueDefinition g; diff --git a/src/main/java/org/violetmoon/zeta/client/config/definition/SectionClientDefinition.java b/src/main/java/org/violetmoon/zeta/client/config/definition/SectionClientDefinition.java index 342a129dc6..0fb2dcc795 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/definition/SectionClientDefinition.java +++ b/src/main/java/org/violetmoon/zeta/client/config/definition/SectionClientDefinition.java @@ -1,17 +1,16 @@ package org.violetmoon.zeta.client.config.definition; -import java.util.function.Consumer; - +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.resources.language.I18n; import org.violetmoon.zeta.client.ZetaClient; import org.violetmoon.zeta.client.config.screen.SectionScreen; import org.violetmoon.zeta.client.config.widget.PencilButton; import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.SectionDefinition; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.resources.language.I18n; +import java.util.function.Consumer; public class SectionClientDefinition implements ClientDefinitionExt { @Override diff --git a/src/main/java/org/violetmoon/zeta/client/config/definition/StringClientDefinition.java b/src/main/java/org/violetmoon/zeta/client/config/definition/StringClientDefinition.java index bbfb12a04f..9c625e05bb 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/definition/StringClientDefinition.java +++ b/src/main/java/org/violetmoon/zeta/client/config/definition/StringClientDefinition.java @@ -1,7 +1,5 @@ package org.violetmoon.zeta.client.config.definition; -import java.util.function.Consumer; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.screens.Screen; @@ -12,6 +10,8 @@ import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.ValueDefinition; +import java.util.function.Consumer; + public class StringClientDefinition implements ClientDefinitionExt> { @Override public String getSubtitle(ChangeSet changes, ValueDefinition def) { diff --git a/src/main/java/org/violetmoon/zeta/client/config/definition/StringListClientDefinition.java b/src/main/java/org/violetmoon/zeta/client/config/definition/StringListClientDefinition.java index e90506167c..262e8e8c9c 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/definition/StringListClientDefinition.java +++ b/src/main/java/org/violetmoon/zeta/client/config/definition/StringListClientDefinition.java @@ -1,17 +1,16 @@ package org.violetmoon.zeta.client.config.definition; -import java.util.List; -import java.util.function.Consumer; - +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.screens.Screen; import org.violetmoon.zeta.client.ZetaClient; import org.violetmoon.zeta.client.config.screen.StringListInputScreen; import org.violetmoon.zeta.client.config.widget.PencilButton; import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.ValueDefinition; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.screens.Screen; +import java.util.List; +import java.util.function.Consumer; public class StringListClientDefinition implements ClientDefinitionExt>> { @Override diff --git a/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractEditBoxInputScreen.java b/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractEditBoxInputScreen.java index 1153c21438..8063a9b94b 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractEditBoxInputScreen.java +++ b/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractEditBoxInputScreen.java @@ -1,7 +1,5 @@ package org.violetmoon.zeta.client.config.screen; -import javax.annotation.Nonnull; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; @@ -13,6 +11,8 @@ import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.ValueDefinition; +import javax.annotation.Nonnull; + public abstract class AbstractEditBoxInputScreen extends AbstractInputScreen { protected EditBox input; diff --git a/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractInputScreen.java b/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractInputScreen.java index 0c0bd9780c..e7db94f44a 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractInputScreen.java +++ b/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractInputScreen.java @@ -1,14 +1,13 @@ package org.violetmoon.zeta.client.config.screen; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.Screen; import org.violetmoon.zeta.client.ZetaClient; import org.violetmoon.zeta.client.config.definition.ClientDefinitionExt; import org.violetmoon.zeta.client.config.widget.DefaultDiscardDone; import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.ValueDefinition; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.screens.Screen; - //TODO: assumes the thing your editing has a direct ValueDefinition, which isn't true for certain types of config screens // like, RGBA color inputs actually correspond to SectionDefinitions in the config public abstract class AbstractInputScreen extends ZetaScreen { diff --git a/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractSectionInputScreen.java b/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractSectionInputScreen.java index af63d4c0c4..1b0ce67d41 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractSectionInputScreen.java +++ b/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractSectionInputScreen.java @@ -1,14 +1,13 @@ package org.violetmoon.zeta.client.config.screen; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.Screen; import org.violetmoon.zeta.client.ZetaClient; import org.violetmoon.zeta.client.config.definition.ClientDefinitionExt; import org.violetmoon.zeta.client.config.widget.DefaultDiscardDone; import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.SectionDefinition; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.screens.Screen; - public abstract class AbstractSectionInputScreen extends ZetaScreen { protected final ChangeSet changes; protected final SectionDefinition def; diff --git a/src/main/java/org/violetmoon/zeta/client/config/screen/SectionScreen.java b/src/main/java/org/violetmoon/zeta/client/config/screen/SectionScreen.java index 654fac78d2..8443fd3fc1 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/screen/SectionScreen.java +++ b/src/main/java/org/violetmoon/zeta/client/config/screen/SectionScreen.java @@ -1,12 +1,5 @@ package org.violetmoon.zeta.client.config.screen; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; - -import javax.annotation.Nonnull; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.screens.Screen; @@ -14,7 +7,6 @@ import net.minecraft.network.chat.Component; import org.apache.commons.lang3.text.WordUtils; import org.jetbrains.annotations.NotNull; -import org.violetmoon.zeta.client.TopLayerTooltipHandler; import org.violetmoon.zeta.client.ZetaClient; import org.violetmoon.zeta.client.config.definition.ClientDefinitionExt; import org.violetmoon.zeta.client.config.widget.DefaultDiscardDone; @@ -24,6 +16,12 @@ import org.violetmoon.zeta.config.SectionDefinition; import org.violetmoon.zeta.config.ValueDefinition; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + public class SectionScreen extends ZetaScreen { protected final SectionDefinition section; protected final ChangeSet changes; diff --git a/src/main/java/org/violetmoon/zeta/client/config/screen/StringListInputScreen.java b/src/main/java/org/violetmoon/zeta/client/config/screen/StringListInputScreen.java index 0497e4d27f..85870e451d 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/screen/StringListInputScreen.java +++ b/src/main/java/org/violetmoon/zeta/client/config/screen/StringListInputScreen.java @@ -1,10 +1,5 @@ package org.violetmoon.zeta.client.config.screen; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.stream.IntStream; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -18,6 +13,11 @@ import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.ValueDefinition; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.IntStream; + public class StringListInputScreen extends AbstractInputScreen> { protected ScrollableWidgetList list; diff --git a/src/main/java/org/violetmoon/zeta/client/config/screen/ZetaConfigHomeScreen.java b/src/main/java/org/violetmoon/zeta/client/config/screen/ZetaConfigHomeScreen.java index 18e2985826..13d3934d48 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/screen/ZetaConfigHomeScreen.java +++ b/src/main/java/org/violetmoon/zeta/client/config/screen/ZetaConfigHomeScreen.java @@ -1,11 +1,5 @@ package org.violetmoon.zeta.client.config.screen; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -23,6 +17,11 @@ import org.violetmoon.zeta.config.ValueDefinition; import org.violetmoon.zeta.module.ZetaCategory; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + public class ZetaConfigHomeScreen extends ZetaScreen { public ZetaConfigHomeScreen(ZetaClient zc, Screen parent) { super(zc, parent); diff --git a/src/main/java/org/violetmoon/zeta/client/config/screen/ZetaScreen.java b/src/main/java/org/violetmoon/zeta/client/config/screen/ZetaScreen.java index 5f40f507e9..3e89844334 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/screen/ZetaScreen.java +++ b/src/main/java/org/violetmoon/zeta/client/config/screen/ZetaScreen.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.client.config.screen; -import org.violetmoon.zeta.Zeta; -import org.violetmoon.zeta.client.ZetaClient; - import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; +import org.violetmoon.zeta.Zeta; +import org.violetmoon.zeta.client.ZetaClient; public abstract class ZetaScreen extends Screen { diff --git a/src/main/java/org/violetmoon/zeta/client/config/widget/CategoryButton.java b/src/main/java/org/violetmoon/zeta/client/config/widget/CategoryButton.java index f9d7800712..fcae169680 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/widget/CategoryButton.java +++ b/src/main/java/org/violetmoon/zeta/client/config/widget/CategoryButton.java @@ -1,17 +1,15 @@ package org.violetmoon.zeta.client.config.widget; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.violetmoon.zeta.client.ZetaClient; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; +import org.violetmoon.zeta.client.ZetaClient; + +import javax.annotation.Nonnull; +import java.util.List; public class CategoryButton extends Button { diff --git a/src/main/java/org/violetmoon/zeta/client/config/widget/CheckboxButton.java b/src/main/java/org/violetmoon/zeta/client/config/widget/CheckboxButton.java index 8e97875da0..aee62ee7b3 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/widget/CheckboxButton.java +++ b/src/main/java/org/violetmoon/zeta/client/config/widget/CheckboxButton.java @@ -1,17 +1,16 @@ package org.violetmoon.zeta.client.config.widget; -import javax.annotation.Nonnull; - -import org.violetmoon.zeta.client.ZetaClient; -import org.violetmoon.zeta.config.ChangeSet; -import org.violetmoon.zeta.config.ValueDefinition; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.components.Button; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.zeta.client.ZetaClient; +import org.violetmoon.zeta.config.ChangeSet; +import org.violetmoon.zeta.config.ValueDefinition; + +import javax.annotation.Nonnull; public class CheckboxButton extends Button { diff --git a/src/main/java/org/violetmoon/zeta/client/config/widget/DefaultDiscardDone.java b/src/main/java/org/violetmoon/zeta/client/config/widget/DefaultDiscardDone.java index 914dbe8ce2..391e7ac0c2 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/widget/DefaultDiscardDone.java +++ b/src/main/java/org/violetmoon/zeta/client/config/widget/DefaultDiscardDone.java @@ -1,14 +1,13 @@ package org.violetmoon.zeta.client.config.widget; -import java.util.function.Consumer; - +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.Button; +import net.minecraft.network.chat.Component; import org.violetmoon.zeta.client.config.screen.ZetaScreen; import org.violetmoon.zeta.config.ChangeSet; import org.violetmoon.zeta.config.Definition; -import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.components.Button; -import net.minecraft.network.chat.Component; +import java.util.function.Consumer; public class DefaultDiscardDone { public final Button resetToDefault; diff --git a/src/main/java/org/violetmoon/zeta/client/config/widget/PencilButton.java b/src/main/java/org/violetmoon/zeta/client/config/widget/PencilButton.java index 4f72bfd6c2..a1122be0ec 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/widget/PencilButton.java +++ b/src/main/java/org/violetmoon/zeta/client/config/widget/PencilButton.java @@ -1,15 +1,14 @@ package org.violetmoon.zeta.client.config.widget; -import javax.annotation.Nonnull; - -import org.violetmoon.zeta.client.ZetaClient; - import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.components.Button; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.zeta.client.ZetaClient; + +import javax.annotation.Nonnull; public class PencilButton extends Button { diff --git a/src/main/java/org/violetmoon/zeta/client/config/widget/ScrollableWidgetList.java b/src/main/java/org/violetmoon/zeta/client/config/widget/ScrollableWidgetList.java index c8211ec10a..d622dd61b4 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/widget/ScrollableWidgetList.java +++ b/src/main/java/org/violetmoon/zeta/client/config/widget/ScrollableWidgetList.java @@ -1,12 +1,5 @@ package org.violetmoon.zeta.client.config.widget; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.function.Consumer; - -import javax.annotation.Nonnull; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.AbstractWidget; @@ -14,6 +7,12 @@ import net.minecraft.client.gui.components.ObjectSelectionList; import net.minecraft.client.gui.screens.Screen; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.function.Consumer; + public class ScrollableWidgetList> extends ObjectSelectionList { public final S parent; diff --git a/src/main/java/org/violetmoon/zeta/client/event/load/ZAddBlockColorHandlers.java b/src/main/java/org/violetmoon/zeta/client/event/load/ZAddBlockColorHandlers.java index 5a7febc8d4..a7fa2ec9c3 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/load/ZAddBlockColorHandlers.java +++ b/src/main/java/org/violetmoon/zeta/client/event/load/ZAddBlockColorHandlers.java @@ -1,13 +1,12 @@ package org.violetmoon.zeta.client.event.load; -import java.util.Map; -import java.util.function.Function; - -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; - import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.block.BlockColors; import net.minecraft.world.level.block.Block; +import org.violetmoon.zeta.event.bus.IZetaLoadEvent; + +import java.util.Map; +import java.util.function.Function; public interface ZAddBlockColorHandlers extends IZetaLoadEvent { void register(BlockColor c, Block... blocks); diff --git a/src/main/java/org/violetmoon/zeta/client/event/load/ZAddItemColorHandlers.java b/src/main/java/org/violetmoon/zeta/client/event/load/ZAddItemColorHandlers.java index 5e119829d7..0035b19b21 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/load/ZAddItemColorHandlers.java +++ b/src/main/java/org/violetmoon/zeta/client/event/load/ZAddItemColorHandlers.java @@ -1,14 +1,13 @@ package org.violetmoon.zeta.client.event.load; -import java.util.Map; -import java.util.function.Function; - -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; - import net.minecraft.client.color.item.ItemColor; import net.minecraft.client.color.item.ItemColors; import net.minecraft.world.item.Item; import net.minecraft.world.level.ItemLike; +import org.violetmoon.zeta.event.bus.IZetaLoadEvent; + +import java.util.Map; +import java.util.function.Function; public interface ZAddItemColorHandlers extends IZetaLoadEvent { void register(ItemColor c, ItemLike... items); diff --git a/src/main/java/org/violetmoon/zeta/client/event/load/ZAddModelLayers.java b/src/main/java/org/violetmoon/zeta/client/event/load/ZAddModelLayers.java index 1be92f5226..c56c03ff00 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/load/ZAddModelLayers.java +++ b/src/main/java/org/violetmoon/zeta/client/event/load/ZAddModelLayers.java @@ -1,12 +1,11 @@ package org.violetmoon.zeta.client.event.load; -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; - import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.entity.LivingEntityRenderer; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; +import org.violetmoon.zeta.event.bus.IZetaLoadEvent; public interface ZAddModelLayers extends IZetaLoadEvent { >> R getRenderer(EntityType entityType); diff --git a/src/main/java/org/violetmoon/zeta/client/event/load/ZAddModels.java b/src/main/java/org/violetmoon/zeta/client/event/load/ZAddModels.java index 04dc585558..fd2a247de7 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/load/ZAddModels.java +++ b/src/main/java/org/violetmoon/zeta/client/event/load/ZAddModels.java @@ -1,8 +1,7 @@ package org.violetmoon.zeta.client.event.load; -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; - import net.minecraft.resources.ResourceLocation; +import org.violetmoon.zeta.event.bus.IZetaLoadEvent; public interface ZAddModels extends IZetaLoadEvent { void register(ResourceLocation model); diff --git a/src/main/java/org/violetmoon/zeta/client/event/load/ZKeyMapping.java b/src/main/java/org/violetmoon/zeta/client/event/load/ZKeyMapping.java index 725e0e29ca..cd02941526 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/load/ZKeyMapping.java +++ b/src/main/java/org/violetmoon/zeta/client/event/load/ZKeyMapping.java @@ -1,7 +1,5 @@ package org.violetmoon.zeta.client.event.load; -import java.util.function.Predicate; - import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; import org.jetbrains.annotations.Nullable; @@ -10,6 +8,8 @@ import org.violetmoon.zeta.client.key.SortedPredicatedKeyBinding; import org.violetmoon.zeta.event.bus.IZetaLoadEvent; +import java.util.function.Predicate; + public interface ZKeyMapping extends IZetaLoadEvent { KeyMapping register(KeyMapping key); diff --git a/src/main/java/org/violetmoon/zeta/client/event/load/ZModelBakingCompleted.java b/src/main/java/org/violetmoon/zeta/client/event/load/ZModelBakingCompleted.java index e2a07cc4e2..f47b0f42cf 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/load/ZModelBakingCompleted.java +++ b/src/main/java/org/violetmoon/zeta/client/event/load/ZModelBakingCompleted.java @@ -1,11 +1,10 @@ package org.violetmoon.zeta.client.event.load; -import java.util.Map; - -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; - import net.minecraft.client.resources.model.BakedModel; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.zeta.event.bus.IZetaLoadEvent; + +import java.util.Map; public interface ZModelBakingCompleted extends IZetaLoadEvent { Map getModels(); diff --git a/src/main/java/org/violetmoon/zeta/client/event/load/ZPreTextureStitch.java b/src/main/java/org/violetmoon/zeta/client/event/load/ZPreTextureStitch.java index 51ddccc593..3fa32e6312 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/load/ZPreTextureStitch.java +++ b/src/main/java/org/violetmoon/zeta/client/event/load/ZPreTextureStitch.java @@ -1,9 +1,8 @@ package org.violetmoon.zeta.client.event.load; -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; - import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; +import org.violetmoon.zeta.event.bus.IZetaLoadEvent; public interface ZPreTextureStitch extends IZetaLoadEvent { TextureAtlas getAtlas(); diff --git a/src/main/java/org/violetmoon/zeta/client/event/load/ZRegisterLayerDefinitions.java b/src/main/java/org/violetmoon/zeta/client/event/load/ZRegisterLayerDefinitions.java index 6ee32da26d..fde0231efb 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/load/ZRegisterLayerDefinitions.java +++ b/src/main/java/org/violetmoon/zeta/client/event/load/ZRegisterLayerDefinitions.java @@ -1,11 +1,10 @@ package org.violetmoon.zeta.client.event.load; -import java.util.function.Supplier; - -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; - import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.builders.LayerDefinition; +import org.violetmoon.zeta.event.bus.IZetaLoadEvent; + +import java.util.function.Supplier; public interface ZRegisterLayerDefinitions extends IZetaLoadEvent { void registerLayerDefinition(ModelLayerLocation layerLocation, Supplier supplier); diff --git a/src/main/java/org/violetmoon/zeta/client/event/load/ZRegisterReloadListeners.java b/src/main/java/org/violetmoon/zeta/client/event/load/ZRegisterReloadListeners.java index a828ea9428..e78a2f4566 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/load/ZRegisterReloadListeners.java +++ b/src/main/java/org/violetmoon/zeta/client/event/load/ZRegisterReloadListeners.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.client.event.load; -import java.util.function.Consumer; - +import net.minecraft.server.packs.resources.PreparableReloadListener; import org.violetmoon.zeta.event.bus.IZetaLoadEvent; -import net.minecraft.server.packs.resources.PreparableReloadListener; +import java.util.function.Consumer; public record ZRegisterReloadListeners(Consumer manager) implements IZetaLoadEvent, Consumer { @Override diff --git a/src/main/java/org/violetmoon/zeta/client/event/load/ZTooltipComponents.java b/src/main/java/org/violetmoon/zeta/client/event/load/ZTooltipComponents.java index d6375dbd75..ba8a5e7c14 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/load/ZTooltipComponents.java +++ b/src/main/java/org/violetmoon/zeta/client/event/load/ZTooltipComponents.java @@ -1,11 +1,10 @@ package org.violetmoon.zeta.client.event.load; -import java.util.function.Function; - -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; - import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.world.inventory.tooltip.TooltipComponent; +import org.violetmoon.zeta.event.bus.IZetaLoadEvent; + +import java.util.function.Function; public interface ZTooltipComponents extends IZetaLoadEvent { void register(Class type, Function factory); diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZCustomizeDebugText.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZCustomizeDebugText.java index 6a080db986..e93991fea9 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZCustomizeDebugText.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZCustomizeDebugText.java @@ -1,11 +1,10 @@ package org.violetmoon.zeta.client.event.play; -import java.util.List; - -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.vertex.PoseStack; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; + +import java.util.List; //TODO ZETA: only used for the network profiler public interface ZCustomizeDebugText extends IZetaPlayEvent { diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZGatherTooltipComponents.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZGatherTooltipComponents.java index 49e388857f..7b1cc7d8ef 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZGatherTooltipComponents.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZGatherTooltipComponents.java @@ -1,13 +1,12 @@ package org.violetmoon.zeta.client.event.play; -import java.util.List; - -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import com.mojang.datafixers.util.Either; import net.minecraft.network.chat.FormattedText; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemStack; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; + +import java.util.List; public interface ZGatherTooltipComponents extends IZetaPlayEvent { ItemStack getItemStack(); diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZHighlightBlock.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZHighlightBlock.java index c67714178c..216e5a9542 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZHighlightBlock.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZHighlightBlock.java @@ -1,11 +1,10 @@ package org.violetmoon.zeta.client.event.play; -import org.violetmoon.zeta.event.bus.Cancellable; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Camera; import net.minecraft.client.renderer.MultiBufferSource; +import org.violetmoon.zeta.event.bus.Cancellable; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZHighlightBlock extends IZetaPlayEvent, Cancellable { MultiBufferSource getMultiBufferSource(); diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZInputUpdate.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZInputUpdate.java index 103418b707..b9a17594db 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZInputUpdate.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZInputUpdate.java @@ -1,9 +1,8 @@ package org.violetmoon.zeta.client.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.client.player.Input; import net.minecraft.world.entity.player.Player; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; //NB. forge fires this in LocalPlayer.aiStep public interface ZInputUpdate extends IZetaPlayEvent { diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderContainerScreen.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderContainerScreen.java index 786eb7e45b..3bbd5db648 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderContainerScreen.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderContainerScreen.java @@ -1,9 +1,8 @@ package org.violetmoon.zeta.client.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZRenderContainerScreen extends IZetaPlayEvent { AbstractContainerScreen getContainerScreen(); diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderGuiOverlay.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderGuiOverlay.java index 46d923f601..b33b4275e6 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderGuiOverlay.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderGuiOverlay.java @@ -1,9 +1,8 @@ package org.violetmoon.zeta.client.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.vertex.PoseStack; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZRenderGuiOverlay extends IZetaPlayEvent { Window getWindow(); diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderLiving.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderLiving.java index b66b87aa11..b9f46daf32 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderLiving.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderLiving.java @@ -1,9 +1,8 @@ package org.violetmoon.zeta.client.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.world.entity.Entity; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZRenderLiving extends IZetaPlayEvent { Entity getEntity(); diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderPlayer.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderPlayer.java index 3024ddad77..abbcf744ae 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderPlayer.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderPlayer.java @@ -1,11 +1,10 @@ package org.violetmoon.zeta.client.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.world.entity.player.Player; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; //TODO: most of this is not used in quark, just patreon renderer public interface ZRenderPlayer extends IZetaPlayEvent { diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderTooltip.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderTooltip.java index 3f3ba41117..0bd904e1ea 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderTooltip.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderTooltip.java @@ -4,11 +4,10 @@ import net.minecraft.network.chat.FormattedText; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemStack; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; import java.util.List; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - public interface ZRenderTooltip extends IZetaPlayEvent { interface GatherComponents extends IZetaPlayEvent, ZRenderTooltip { ItemStack getItemStack(); diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZScreen.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZScreen.java index 17752de683..e5b6f8d59e 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZScreen.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZScreen.java @@ -3,12 +3,11 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; - -import java.util.List; - import org.violetmoon.zeta.event.bus.Cancellable; import org.violetmoon.zeta.event.bus.IZetaPlayEvent; +import java.util.List; + public interface ZScreen extends IZetaPlayEvent { Screen getScreen(); diff --git a/src/main/java/org/violetmoon/zeta/client/key/SortedKeyBinding.java b/src/main/java/org/violetmoon/zeta/client/key/SortedKeyBinding.java index 762bee807d..e622f056e0 100644 --- a/src/main/java/org/violetmoon/zeta/client/key/SortedKeyBinding.java +++ b/src/main/java/org/violetmoon/zeta/client/key/SortedKeyBinding.java @@ -1,7 +1,6 @@ package org.violetmoon.zeta.client.key; import com.mojang.blaze3d.platform.InputConstants.Type; - import net.minecraft.client.KeyMapping; /** diff --git a/src/main/java/org/violetmoon/zeta/config/ChangeSet.java b/src/main/java/org/violetmoon/zeta/config/ChangeSet.java index 560bc3a562..2e5b0ade19 100644 --- a/src/main/java/org/violetmoon/zeta/config/ChangeSet.java +++ b/src/main/java/org/violetmoon/zeta/config/ChangeSet.java @@ -1,10 +1,6 @@ package org.violetmoon.zeta.config; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; public class ChangeSet implements IZetaConfigInternals { private final IZetaConfigInternals internals; diff --git a/src/main/java/org/violetmoon/zeta/config/ConfigManager.java b/src/main/java/org/violetmoon/zeta/config/ConfigManager.java index d5e59102d1..ec69f31741 100644 --- a/src/main/java/org/violetmoon/zeta/config/ConfigManager.java +++ b/src/main/java/org/violetmoon/zeta/config/ConfigManager.java @@ -1,13 +1,5 @@ package org.violetmoon.zeta.config; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Consumer; - import org.jetbrains.annotations.Nullable; import org.violetmoon.quark.base.config.ConfigFlagManager; import org.violetmoon.quark.base.handler.GeneralConfig; @@ -17,6 +9,9 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.module.ZetaModuleManager; +import java.util.*; +import java.util.function.Consumer; + public class ConfigManager { private final Zeta z; private final ConfigFlagManager cfm; diff --git a/src/main/java/org/violetmoon/zeta/config/ConfigObjectMapper.java b/src/main/java/org/violetmoon/zeta/config/ConfigObjectMapper.java index 8b6ca105f1..b6b084eb1f 100644 --- a/src/main/java/org/violetmoon/zeta/config/ConfigObjectMapper.java +++ b/src/main/java/org/violetmoon/zeta/config/ConfigObjectMapper.java @@ -1,5 +1,12 @@ package org.violetmoon.zeta.config; +import org.apache.commons.lang3.text.WordUtils; +import org.jetbrains.annotations.Nullable; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.config.ConfigFlagManager; +import org.violetmoon.quark.base.config.type.IConfigType; +import org.violetmoon.zeta.module.ZetaModule; + import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -12,13 +19,6 @@ import java.util.function.Consumer; import java.util.function.Predicate; -import org.apache.commons.lang3.text.WordUtils; -import org.jetbrains.annotations.Nullable; -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.config.ConfigFlagManager; -import org.violetmoon.quark.base.config.type.IConfigType; -import org.violetmoon.zeta.module.ZetaModule; - public class ConfigObjectMapper { public static List walkModuleFields(Class clazz) { List list = new ArrayList<>(); diff --git a/src/main/java/org/violetmoon/zeta/config/Definition.java b/src/main/java/org/violetmoon/zeta/config/Definition.java index e1e8f6ed36..eb6748d546 100644 --- a/src/main/java/org/violetmoon/zeta/config/Definition.java +++ b/src/main/java/org/violetmoon/zeta/config/Definition.java @@ -1,16 +1,11 @@ package org.violetmoon.zeta.config; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; +import org.jetbrains.annotations.Nullable; + +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import org.jetbrains.annotations.Nullable; -import org.violetmoon.quark.base.config.type.IConfigType; - /** * Common superclass of a... "thing" in a config definition (a value or section). * diff --git a/src/main/java/org/violetmoon/zeta/config/SectionDefinition.java b/src/main/java/org/violetmoon/zeta/config/SectionDefinition.java index fee5b2fff5..36ec93ea5b 100644 --- a/src/main/java/org/violetmoon/zeta/config/SectionDefinition.java +++ b/src/main/java/org/violetmoon/zeta/config/SectionDefinition.java @@ -1,13 +1,13 @@ package org.violetmoon.zeta.config; +import org.jetbrains.annotations.Nullable; + import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.function.Predicate; -import org.jetbrains.annotations.Nullable; - public class SectionDefinition extends Definition { public final Map subsections = new LinkedHashMap<>(); public final Map> values = new LinkedHashMap<>(); diff --git a/src/main/java/org/violetmoon/zeta/config/ValueDefinition.java b/src/main/java/org/violetmoon/zeta/config/ValueDefinition.java index 9e76588366..55118f7c95 100644 --- a/src/main/java/org/violetmoon/zeta/config/ValueDefinition.java +++ b/src/main/java/org/violetmoon/zeta/config/ValueDefinition.java @@ -1,10 +1,10 @@ package org.violetmoon.zeta.config; +import org.jetbrains.annotations.Nullable; + import java.util.List; import java.util.function.Predicate; -import org.jetbrains.annotations.Nullable; - //TODO: maybe we need "boolean equals(T thing1, T thing2)" public class ValueDefinition extends Definition { public final T defaultValue; diff --git a/src/main/java/org/violetmoon/zeta/event/bus/ZetaEventBus.java b/src/main/java/org/violetmoon/zeta/event/bus/ZetaEventBus.java index faf429f133..0369e1b850 100644 --- a/src/main/java/org/violetmoon/zeta/event/bus/ZetaEventBus.java +++ b/src/main/java/org/violetmoon/zeta/event/bus/ZetaEventBus.java @@ -1,22 +1,18 @@ package org.violetmoon.zeta.event.bus; +import com.google.common.base.Preconditions; +import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Stream; -import com.google.common.base.Preconditions; -import org.apache.logging.log4j.Logger; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - /** * A polymorphic event bus. Events can be fired under one of their supertypes, allowing a sort of API/impl split of events. */ diff --git a/src/main/java/org/violetmoon/zeta/event/load/ZAddReloadListener.java b/src/main/java/org/violetmoon/zeta/event/load/ZAddReloadListener.java index 9526aacf41..e7ab5fb342 100644 --- a/src/main/java/org/violetmoon/zeta/event/load/ZAddReloadListener.java +++ b/src/main/java/org/violetmoon/zeta/event/load/ZAddReloadListener.java @@ -1,9 +1,8 @@ package org.violetmoon.zeta.event.load; -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; - import net.minecraft.server.ReloadableServerResources; import net.minecraft.server.packs.resources.PreparableReloadListener; +import org.violetmoon.zeta.event.bus.IZetaLoadEvent; public interface ZAddReloadListener extends IZetaLoadEvent { ReloadableServerResources getServerResources(); diff --git a/src/main/java/org/violetmoon/zeta/event/load/ZEntityAttributeCreation.java b/src/main/java/org/violetmoon/zeta/event/load/ZEntityAttributeCreation.java index 8023963b4c..981e9a9893 100644 --- a/src/main/java/org/violetmoon/zeta/event/load/ZEntityAttributeCreation.java +++ b/src/main/java/org/violetmoon/zeta/event/load/ZEntityAttributeCreation.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.event.load; -import org.violetmoon.zeta.event.bus.IZetaLoadEvent; - import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; +import org.violetmoon.zeta.event.bus.IZetaLoadEvent; public interface ZEntityAttributeCreation extends IZetaLoadEvent { void put(EntityType entity, AttributeSupplier map); diff --git a/src/main/java/org/violetmoon/zeta/event/play/ZAnvilRepair.java b/src/main/java/org/violetmoon/zeta/event/play/ZAnvilRepair.java index 79ff82e381..6ca30c2bdf 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/ZAnvilRepair.java +++ b/src/main/java/org/violetmoon/zeta/event/play/ZAnvilRepair.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.event.play; +import net.minecraft.world.item.ItemStack; import org.violetmoon.zeta.event.bus.IZetaPlayEvent; import org.violetmoon.zeta.event.bus.helpers.PlayerGetter; -import net.minecraft.world.item.ItemStack; - public interface ZAnvilRepair extends IZetaPlayEvent, PlayerGetter { ItemStack getOutput(); ItemStack getLeft(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/ZAnvilUpdate.java b/src/main/java/org/violetmoon/zeta/event/play/ZAnvilUpdate.java index 820ee68d9b..000482260c 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/ZAnvilUpdate.java +++ b/src/main/java/org/violetmoon/zeta/event/play/ZAnvilUpdate.java @@ -1,9 +1,8 @@ package org.violetmoon.zeta.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZAnvilUpdate extends IZetaPlayEvent { ItemStack getLeft(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/ZBlock.java b/src/main/java/org/violetmoon/zeta/event/play/ZBlock.java index 9f5a454d9d..0686b90dd0 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/ZBlock.java +++ b/src/main/java/org/violetmoon/zeta/event/play/ZBlock.java @@ -1,11 +1,10 @@ package org.violetmoon.zeta.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZBlock extends IZetaPlayEvent { LevelAccessor getLevel(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/ZBonemeal.java b/src/main/java/org/violetmoon/zeta/event/play/ZBonemeal.java index 464bce7081..a12227dbc2 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/ZBonemeal.java +++ b/src/main/java/org/violetmoon/zeta/event/play/ZBonemeal.java @@ -1,12 +1,11 @@ package org.violetmoon.zeta.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; -import org.violetmoon.zeta.event.bus.Resultable; - import net.minecraft.core.BlockPos; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; +import org.violetmoon.zeta.event.bus.Resultable; public interface ZBonemeal extends IZetaPlayEvent, Resultable { Level getLevel(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/ZFurnaceFuelBurnTime.java b/src/main/java/org/violetmoon/zeta/event/play/ZFurnaceFuelBurnTime.java index 1d0fa13d20..e3cfd698bc 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/ZFurnaceFuelBurnTime.java +++ b/src/main/java/org/violetmoon/zeta/event/play/ZFurnaceFuelBurnTime.java @@ -1,8 +1,7 @@ package org.violetmoon.zeta.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.item.ItemStack; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZFurnaceFuelBurnTime extends IZetaPlayEvent { ItemStack getItemStack(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/ZItemTooltip.java b/src/main/java/org/violetmoon/zeta/event/play/ZItemTooltip.java index 12e952c281..7a56cedcf7 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/ZItemTooltip.java +++ b/src/main/java/org/violetmoon/zeta/event/play/ZItemTooltip.java @@ -1,13 +1,12 @@ package org.violetmoon.zeta.event.play; -import java.util.List; - -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; + +import java.util.List; public interface ZItemTooltip extends IZetaPlayEvent { TooltipFlag getFlags(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/ZLevelTick.java b/src/main/java/org/violetmoon/zeta/event/play/ZLevelTick.java index 4c866e6665..2687d3996d 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/ZLevelTick.java +++ b/src/main/java/org/violetmoon/zeta/event/play/ZLevelTick.java @@ -1,8 +1,7 @@ package org.violetmoon.zeta.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.level.Level; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZLevelTick extends IZetaPlayEvent { Level getLevel(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/ZPlayNoteBlock.java b/src/main/java/org/violetmoon/zeta/event/play/ZPlayNoteBlock.java index 3a2848c4cf..755aab0835 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/ZPlayNoteBlock.java +++ b/src/main/java/org/violetmoon/zeta/event/play/ZPlayNoteBlock.java @@ -1,12 +1,11 @@ package org.violetmoon.zeta.event.play; -import org.violetmoon.zeta.event.bus.Cancellable; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; +import org.violetmoon.zeta.event.bus.Cancellable; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZPlayNoteBlock extends IZetaPlayEvent, Cancellable { LevelAccessor getLevel(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityConstruct.java b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityConstruct.java index 8c08623e92..59975662d0 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityConstruct.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityConstruct.java @@ -1,8 +1,7 @@ package org.violetmoon.zeta.event.play.entity; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.entity.Entity; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZEntityConstruct extends IZetaPlayEvent { Entity getEntity(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityInteract.java b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityInteract.java index 0d4e73dd55..4074c097d5 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityInteract.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityInteract.java @@ -1,12 +1,11 @@ package org.violetmoon.zeta.event.play.entity; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZEntityInteract extends IZetaPlayEvent { Entity getTarget(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityItemPickup.java b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityItemPickup.java index cfe6f70815..d7d5dbb1df 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityItemPickup.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityItemPickup.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.event.play.entity; +import net.minecraft.world.entity.item.ItemEntity; import org.violetmoon.zeta.event.bus.IZetaPlayEvent; import org.violetmoon.zeta.event.bus.helpers.PlayerGetter; -import net.minecraft.world.entity.item.ItemEntity; - public interface ZEntityItemPickup extends IZetaPlayEvent, PlayerGetter { ItemEntity getItem(); } diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityJoinLevel.java b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityJoinLevel.java index e4156b9412..cfc450b4bc 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityJoinLevel.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityJoinLevel.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.event.play.entity; +import net.minecraft.world.entity.Entity; import org.violetmoon.zeta.event.bus.Cancellable; import org.violetmoon.zeta.event.bus.IZetaPlayEvent; -import net.minecraft.world.entity.Entity; - public interface ZEntityJoinLevel extends IZetaPlayEvent, Cancellable { Entity getEntity(); } diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityMobGriefing.java b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityMobGriefing.java index 994af8e924..69aa18368a 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityMobGriefing.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityMobGriefing.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.event.play.entity; +import net.minecraft.world.entity.Entity; import org.violetmoon.zeta.event.bus.IZetaPlayEvent; import org.violetmoon.zeta.event.bus.Resultable; -import net.minecraft.world.entity.Entity; - public interface ZEntityMobGriefing extends IZetaPlayEvent, Resultable { Entity getEntity(); } diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityTeleport.java b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityTeleport.java index 3858579075..7ce053c8d2 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityTeleport.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/ZEntityTeleport.java @@ -1,8 +1,7 @@ package org.violetmoon.zeta.event.play.entity; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.entity.Entity; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZEntityTeleport extends IZetaPlayEvent { Entity getEntity(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZAnimalTame.java b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZAnimalTame.java index f46560f06b..b8ccd47488 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZAnimalTame.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZAnimalTame.java @@ -1,9 +1,8 @@ package org.violetmoon.zeta.event.play.entity.living; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.entity.animal.Animal; import net.minecraft.world.entity.player.Player; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZAnimalTame extends IZetaPlayEvent { Animal getAnimal(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZBabyEntitySpawn.java b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZBabyEntitySpawn.java index 1d81da5fd0..772c9856db 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZBabyEntitySpawn.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZBabyEntitySpawn.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.event.play.entity.living; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.entity.AgeableMob; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.player.Player; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZBabyEntitySpawn extends IZetaPlayEvent { Mob getParentA(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingChangeTarget.java b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingChangeTarget.java index e0a008385d..b1af391f6c 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingChangeTarget.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingChangeTarget.java @@ -1,12 +1,11 @@ package org.violetmoon.zeta.event.play.entity.living; +import net.minecraft.world.entity.LivingEntity; +import net.minecraftforge.event.entity.living.LivingChangeTargetEvent; import org.violetmoon.zeta.event.bus.Cancellable; import org.violetmoon.zeta.event.bus.IZetaPlayEvent; import org.violetmoon.zeta.event.bus.helpers.LivingGetter; -import net.minecraft.world.entity.LivingEntity; -import net.minecraftforge.event.entity.living.LivingChangeTargetEvent; - public interface ZLivingChangeTarget extends IZetaPlayEvent, Cancellable, LivingGetter { LivingEntity getNewTarget(); LivingChangeTargetEvent.ILivingTargetType getTargetType(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingConversion.java b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingConversion.java index 9543665f61..ded16a958e 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingConversion.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingConversion.java @@ -1,12 +1,11 @@ package org.violetmoon.zeta.event.play.entity.living; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; import org.violetmoon.zeta.event.bus.Cancellable; import org.violetmoon.zeta.event.bus.IZetaPlayEvent; import org.violetmoon.zeta.event.bus.helpers.LivingGetter; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; - public interface ZLivingConversion extends IZetaPlayEvent, Cancellable, LivingGetter { interface Pre extends ZLivingConversion { EntityType getOutcome(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingDeath.java b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingDeath.java index 32327301a5..14b2826409 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingDeath.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingDeath.java @@ -1,9 +1,8 @@ package org.violetmoon.zeta.event.play.entity.living; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZLivingDeath extends IZetaPlayEvent { Entity getEntity(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingDrops.java b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingDrops.java index d772026756..df42595777 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingDrops.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingDrops.java @@ -2,13 +2,12 @@ import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.item.ItemEntity; - -import java.util.Collection; - import org.violetmoon.zeta.event.bus.Cancellable; import org.violetmoon.zeta.event.bus.IZetaPlayEvent; import org.violetmoon.zeta.event.bus.helpers.LivingGetter; +import java.util.Collection; + public interface ZLivingDrops extends IZetaPlayEvent, Cancellable, LivingGetter { DamageSource getSource(); Collection getDrops(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingSpawn.java b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingSpawn.java index 173343b60f..49a494d955 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingSpawn.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingSpawn.java @@ -1,12 +1,11 @@ package org.violetmoon.zeta.event.play.entity.living; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; -import org.violetmoon.zeta.event.bus.Resultable; - import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.level.BaseSpawner; import net.minecraft.world.level.LevelAccessor; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; +import org.violetmoon.zeta.event.bus.Resultable; public interface ZLivingSpawn extends IZetaPlayEvent, Resultable { Mob getEntity(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingTick.java b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingTick.java index 239a848010..d698ee05e8 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingTick.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZLivingTick.java @@ -1,8 +1,7 @@ package org.violetmoon.zeta.event.play.entity.living; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.entity.LivingEntity; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZLivingTick extends IZetaPlayEvent { LivingEntity getEntity(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZSleepingLocationCheck.java b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZSleepingLocationCheck.java index 4d9a6ef097..4a8a7dfd4e 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZSleepingLocationCheck.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/living/ZSleepingLocationCheck.java @@ -1,11 +1,10 @@ package org.violetmoon.zeta.event.play.entity.living; +import net.minecraft.core.BlockPos; import org.violetmoon.zeta.event.bus.IZetaPlayEvent; import org.violetmoon.zeta.event.bus.Resultable; import org.violetmoon.zeta.event.bus.helpers.LivingGetter; -import net.minecraft.core.BlockPos; - public interface ZSleepingLocationCheck extends IZetaPlayEvent, LivingGetter, Resultable { BlockPos getSleepingLocation(); } diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayer.java b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayer.java index 93433936a2..a65a667e58 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayer.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayer.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.event.play.entity.player; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; -import org.violetmoon.zeta.event.bus.helpers.PlayerGetter; - import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; +import org.violetmoon.zeta.event.bus.helpers.PlayerGetter; public interface ZPlayer extends IZetaPlayEvent, PlayerGetter { interface BreakSpeed extends ZPlayer { diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerDestroyItem.java b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerDestroyItem.java index 38f52ade75..4b67410ec8 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerDestroyItem.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerDestroyItem.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.event.play.entity.player; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZPlayerDestroyItem extends IZetaPlayEvent { Player getEntity(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerInteract.java b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerInteract.java index 743eb08caa..c4b92317f3 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerInteract.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerInteract.java @@ -1,8 +1,5 @@ package org.violetmoon.zeta.event.play.entity.player; -import org.violetmoon.zeta.event.bus.Cancellable; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; @@ -10,6 +7,8 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import org.violetmoon.zeta.event.bus.Cancellable; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZPlayerInteract extends IZetaPlayEvent, Cancellable { Player getEntity(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerTick.java b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerTick.java index 357e3f47ae..5fd98676b5 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerTick.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZPlayerTick.java @@ -1,8 +1,7 @@ package org.violetmoon.zeta.event.play.entity.player; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.entity.player.Player; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZPlayerTick extends IZetaPlayEvent { Player getPlayer(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZRightClickBlock.java b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZRightClickBlock.java index e17f5f2a6a..8a55d0ee76 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZRightClickBlock.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZRightClickBlock.java @@ -1,11 +1,5 @@ package org.violetmoon.zeta.event.play.entity.player; -import org.violetmoon.zeta.event.bus.Cancellable; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; -import org.violetmoon.zeta.event.bus.Resultable; -import org.violetmoon.zeta.event.bus.ZResult; -import org.violetmoon.zeta.event.bus.helpers.PlayerGetter; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -13,6 +7,11 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.phys.BlockHitResult; +import org.violetmoon.zeta.event.bus.Cancellable; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; +import org.violetmoon.zeta.event.bus.Resultable; +import org.violetmoon.zeta.event.bus.ZResult; +import org.violetmoon.zeta.event.bus.helpers.PlayerGetter; public interface ZRightClickBlock extends IZetaPlayEvent, Cancellable, Resultable, PlayerGetter { Level getLevel(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZRightClickItem.java b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZRightClickItem.java index 046a2dc606..7f888c9607 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZRightClickItem.java +++ b/src/main/java/org/violetmoon/zeta/event/play/entity/player/ZRightClickItem.java @@ -1,13 +1,12 @@ package org.violetmoon.zeta.event.play.entity.player; -import org.violetmoon.zeta.event.bus.Cancellable; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import org.violetmoon.zeta.event.bus.Cancellable; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZRightClickItem extends IZetaPlayEvent, Cancellable { Player getEntity(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/loading/ZAttachCapabilities.java b/src/main/java/org/violetmoon/zeta/event/play/loading/ZAttachCapabilities.java index c451aeaa79..cde4ee4f89 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/loading/ZAttachCapabilities.java +++ b/src/main/java/org/violetmoon/zeta/event/play/loading/ZAttachCapabilities.java @@ -1,14 +1,13 @@ package org.violetmoon.zeta.event.play.loading; -import org.violetmoon.zeta.capability.ZetaCapability; -import org.violetmoon.zeta.capability.ZetaCapabilityManager; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.common.capabilities.ICapabilityProvider; +import org.violetmoon.zeta.capability.ZetaCapability; +import org.violetmoon.zeta.capability.ZetaCapabilityManager; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZAttachCapabilities extends IZetaPlayEvent { ZetaCapabilityManager getCapabilityManager(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/loading/ZGatherHints.java b/src/main/java/org/violetmoon/zeta/event/play/loading/ZGatherHints.java index ea9d0a28aa..6e6a0b33db 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/loading/ZGatherHints.java +++ b/src/main/java/org/violetmoon/zeta/event/play/loading/ZGatherHints.java @@ -1,12 +1,12 @@ package org.violetmoon.zeta.event.play.loading; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.BiConsumer; - +import net.minecraft.core.Registry; +import net.minecraft.data.BuiltinRegistries; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.ItemLike; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.ConfigFlagManager; import org.violetmoon.quark.base.handler.MiscUtil; @@ -15,13 +15,12 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.core.Registry; -import net.minecraft.data.BuiltinRegistries; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.ItemLike; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; public interface ZGatherHints extends IZetaPlayEvent, BiConsumer { default void hintItem(ItemLike itemLike, Object... extra) { diff --git a/src/main/java/org/violetmoon/zeta/event/play/loading/ZLootTableLoad.java b/src/main/java/org/violetmoon/zeta/event/play/loading/ZLootTableLoad.java index 638d55fdc5..1d7f11d825 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/loading/ZLootTableLoad.java +++ b/src/main/java/org/violetmoon/zeta/event/play/loading/ZLootTableLoad.java @@ -1,16 +1,15 @@ package org.violetmoon.zeta.event.play.loading; -import java.util.List; - -import org.violetmoon.zeta.event.bus.Cancellable; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; -import org.violetmoon.zeta.mixin.mixins.AccessorLootTable; - import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.LootTables; import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; +import org.violetmoon.zeta.event.bus.Cancellable; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; +import org.violetmoon.zeta.mixin.mixins.AccessorLootTable; + +import java.util.List; public interface ZLootTableLoad extends IZetaPlayEvent, Cancellable { ResourceLocation getName(); diff --git a/src/main/java/org/violetmoon/zeta/event/play/loading/ZVillagerTrades.java b/src/main/java/org/violetmoon/zeta/event/play/loading/ZVillagerTrades.java index 197b0ebcd0..4e9f232cec 100644 --- a/src/main/java/org/violetmoon/zeta/event/play/loading/ZVillagerTrades.java +++ b/src/main/java/org/violetmoon/zeta/event/play/loading/ZVillagerTrades.java @@ -3,11 +3,10 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.world.entity.npc.VillagerProfession; import net.minecraft.world.entity.npc.VillagerTrades; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; import java.util.List; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - public interface ZVillagerTrades extends IZetaPlayEvent { Int2ObjectMap> getTrades(); VillagerProfession getType(); diff --git a/src/main/java/org/violetmoon/zeta/item/IZetaItem.java b/src/main/java/org/violetmoon/zeta/item/IZetaItem.java index f0fa704cf6..2838c7fd06 100644 --- a/src/main/java/org/violetmoon/zeta/item/IZetaItem.java +++ b/src/main/java/org/violetmoon/zeta/item/IZetaItem.java @@ -1,8 +1,7 @@ package org.violetmoon.zeta.item; -import org.violetmoon.zeta.module.IDisableable; - import net.minecraft.world.item.Item; +import org.violetmoon.zeta.module.IDisableable; public interface IZetaItem extends IDisableable { diff --git a/src/main/java/org/violetmoon/zeta/item/ext/IZetaItemExtensions.java b/src/main/java/org/violetmoon/zeta/item/ext/IZetaItemExtensions.java index fd7bc16717..0644abb9f1 100644 --- a/src/main/java/org/violetmoon/zeta/item/ext/IZetaItemExtensions.java +++ b/src/main/java/org/violetmoon/zeta/item/ext/IZetaItemExtensions.java @@ -1,7 +1,5 @@ package org.violetmoon.zeta.item.ext; -import java.util.Map; - import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.monster.EnderMan; import net.minecraft.world.entity.player.Player; @@ -14,6 +12,8 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; import org.jetbrains.annotations.Nullable; +import java.util.Map; + //TODO ZETA: more extensions (remove all usages of IForgeItem, implement this interface on Quark's items) @SuppressWarnings("deprecation") //forge ext public interface IZetaItemExtensions { diff --git a/src/main/java/org/violetmoon/zeta/mixin/plugin/delegates/ForgeItemDelegate.java b/src/main/java/org/violetmoon/zeta/mixin/plugin/delegates/ForgeItemDelegate.java index b5eab9dc6e..74f1a5486e 100644 --- a/src/main/java/org/violetmoon/zeta/mixin/plugin/delegates/ForgeItemDelegate.java +++ b/src/main/java/org/violetmoon/zeta/mixin/plugin/delegates/ForgeItemDelegate.java @@ -2,13 +2,12 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.Enchantment; - -import java.util.Map; - import org.violetmoon.quark.content.tweaks.module.GoldToolsHaveFortuneModule; import org.violetmoon.zeta.mixin.plugin.DelegateInterfaceTarget; import org.violetmoon.zeta.mixin.plugin.DelegateReturnValueTarget; +import java.util.Map; + @DelegateInterfaceTarget public class ForgeItemDelegate { @DelegateReturnValueTarget("getEnchantmentLevel(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/enchantment/Enchantment;)I") diff --git a/src/main/java/org/violetmoon/zeta/mixin/plugin/delegates/WeatheringCopperDelegate.java b/src/main/java/org/violetmoon/zeta/mixin/plugin/delegates/WeatheringCopperDelegate.java index 12fac3a755..78bbe9cd66 100644 --- a/src/main/java/org/violetmoon/zeta/mixin/plugin/delegates/WeatheringCopperDelegate.java +++ b/src/main/java/org/violetmoon/zeta/mixin/plugin/delegates/WeatheringCopperDelegate.java @@ -1,13 +1,12 @@ package org.violetmoon.zeta.mixin.plugin.delegates; import net.minecraft.world.level.block.state.BlockState; - -import java.util.Optional; - import org.violetmoon.zeta.block.ext.CustomWeatheringCopper; import org.violetmoon.zeta.mixin.plugin.DelegateInterfaceTarget; import org.violetmoon.zeta.mixin.plugin.DelegateReturnValueTarget; +import java.util.Optional; + @DelegateInterfaceTarget public class WeatheringCopperDelegate { diff --git a/src/main/java/org/violetmoon/zeta/module/IDisableable.java b/src/main/java/org/violetmoon/zeta/module/IDisableable.java index 979bfc66d0..b1d266e052 100644 --- a/src/main/java/org/violetmoon/zeta/module/IDisableable.java +++ b/src/main/java/org/violetmoon/zeta/module/IDisableable.java @@ -1,12 +1,12 @@ package org.violetmoon.zeta.module; -import java.util.function.BooleanSupplier; - import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import org.jetbrains.annotations.Nullable; +import java.util.function.BooleanSupplier; + public interface IDisableable { @Nullable ZetaModule getModule(); diff --git a/src/main/java/org/violetmoon/zeta/module/ServiceLoaderModuleFinder.java b/src/main/java/org/violetmoon/zeta/module/ServiceLoaderModuleFinder.java index 56cae67300..a22826c547 100644 --- a/src/main/java/org/violetmoon/zeta/module/ServiceLoaderModuleFinder.java +++ b/src/main/java/org/violetmoon/zeta/module/ServiceLoaderModuleFinder.java @@ -1,11 +1,11 @@ package org.violetmoon.zeta.module; +import org.violetmoon.zeta.Zeta; + import java.util.Objects; import java.util.ServiceLoader; import java.util.stream.Stream; -import org.violetmoon.zeta.Zeta; - /** * @see org.violetmoon.zetaimplforge.module.ModFileScanDataModuleFinder alternative Forge-only implementation */ diff --git a/src/main/java/org/violetmoon/zeta/module/TentativeModule.java b/src/main/java/org/violetmoon/zeta/module/TentativeModule.java index 414164df41..14e601b33e 100644 --- a/src/main/java/org/violetmoon/zeta/module/TentativeModule.java +++ b/src/main/java/org/violetmoon/zeta/module/TentativeModule.java @@ -1,14 +1,14 @@ package org.violetmoon.zeta.module; +import net.minecraftforge.api.distmarker.Dist; +import org.apache.commons.lang3.text.WordUtils; +import org.violetmoon.zeta.util.ZetaSide; + import java.util.List; import java.util.Locale; import java.util.Set; import java.util.function.Function; -import net.minecraftforge.api.distmarker.Dist; -import org.apache.commons.lang3.text.WordUtils; -import org.violetmoon.zeta.util.ZetaSide; - /** * performs some common data-munging of the data straight off a ZetaLoadModule annotation */ diff --git a/src/main/java/org/violetmoon/zeta/module/ZetaCategory.java b/src/main/java/org/violetmoon/zeta/module/ZetaCategory.java index b0924b6751..6dbe0464d5 100644 --- a/src/main/java/org/violetmoon/zeta/module/ZetaCategory.java +++ b/src/main/java/org/violetmoon/zeta/module/ZetaCategory.java @@ -1,13 +1,13 @@ package org.violetmoon.zeta.module; -import java.util.function.Supplier; - import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import org.jetbrains.annotations.Nullable; import org.violetmoon.zeta.Zeta; +import java.util.function.Supplier; + /** * @see org.violetmoon.zeta.module.ZetaModuleManager for a good way to obtain these */ diff --git a/src/main/java/org/violetmoon/zeta/module/ZetaLoadModuleAnnotationData.java b/src/main/java/org/violetmoon/zeta/module/ZetaLoadModuleAnnotationData.java index c353a960c9..eaf2f50c01 100644 --- a/src/main/java/org/violetmoon/zeta/module/ZetaLoadModuleAnnotationData.java +++ b/src/main/java/org/violetmoon/zeta/module/ZetaLoadModuleAnnotationData.java @@ -1,11 +1,11 @@ package org.violetmoon.zeta.module; +import net.minecraftforge.api.distmarker.Dist; + import java.util.ArrayList; import java.util.List; import java.util.Map; -import net.minecraftforge.api.distmarker.Dist; - /** * Exists mainly because Forge ModFileScanData doesn't give you the annotation itself :S * diff --git a/src/main/java/org/violetmoon/zeta/module/ZetaModule.java b/src/main/java/org/violetmoon/zeta/module/ZetaModule.java index 3f108b29f1..75e6ca329c 100644 --- a/src/main/java/org/violetmoon/zeta/module/ZetaModule.java +++ b/src/main/java/org/violetmoon/zeta/module/ZetaModule.java @@ -1,15 +1,10 @@ package org.violetmoon.zeta.module; -import java.util.List; -import java.util.Set; - import org.violetmoon.zeta.Zeta; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.play.loading.ZGatherHints; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.loading.FMLEnvironment; +import java.util.Set; public class ZetaModule { public Zeta zeta; diff --git a/src/main/java/org/violetmoon/zeta/module/ZetaModuleManager.java b/src/main/java/org/violetmoon/zeta/module/ZetaModuleManager.java index eb1804b8ac..4d579ccd28 100644 --- a/src/main/java/org/violetmoon/zeta/module/ZetaModuleManager.java +++ b/src/main/java/org/violetmoon/zeta/module/ZetaModuleManager.java @@ -1,21 +1,13 @@ package org.violetmoon.zeta.module; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - import org.jetbrains.annotations.Nullable; import org.violetmoon.zeta.Zeta; import org.violetmoon.zeta.event.load.ZModulesReady; import org.violetmoon.zeta.util.ZetaSide; +import java.lang.reflect.Constructor; +import java.util.*; + /** * TODO: other forms of module discovery and replacement (like a Forge-only module, or other types of 'replacement' modules) */ diff --git a/src/main/java/org/violetmoon/zeta/network/IZetaNetworkEventContext.java b/src/main/java/org/violetmoon/zeta/network/IZetaNetworkEventContext.java index 203c5a1cd4..8a35723a8d 100644 --- a/src/main/java/org/violetmoon/zeta/network/IZetaNetworkEventContext.java +++ b/src/main/java/org/violetmoon/zeta/network/IZetaNetworkEventContext.java @@ -1,11 +1,11 @@ package org.violetmoon.zeta.network; -import java.util.concurrent.CompletableFuture; - import net.minecraft.network.Connection; import net.minecraft.server.level.ServerPlayer; import org.jetbrains.annotations.Nullable; +import java.util.concurrent.CompletableFuture; + public interface IZetaNetworkEventContext { CompletableFuture enqueueWork(Runnable runnable); @Nullable ServerPlayer getSender(); diff --git a/src/main/java/org/violetmoon/zeta/network/ZetaMessageSerializer.java b/src/main/java/org/violetmoon/zeta/network/ZetaMessageSerializer.java index 67031d60a5..ac4fe3c281 100644 --- a/src/main/java/org/violetmoon/zeta/network/ZetaMessageSerializer.java +++ b/src/main/java/org/violetmoon/zeta/network/ZetaMessageSerializer.java @@ -1,16 +1,5 @@ package org.violetmoon.zeta.network; -import java.lang.reflect.Array; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; -import java.util.function.BiConsumer; -import java.util.function.Function; - import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; @@ -20,6 +9,13 @@ import net.minecraft.world.phys.BlockHitResult; import org.apache.commons.lang3.tuple.Pair; +import java.lang.reflect.Array; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.*; +import java.util.function.BiConsumer; +import java.util.function.Function; + @SuppressWarnings({ "unchecked", "rawtypes", "unused" }) public final class ZetaMessageSerializer { diff --git a/src/main/java/org/violetmoon/zeta/piston/ZetaPistonStructureResolver.java b/src/main/java/org/violetmoon/zeta/piston/ZetaPistonStructureResolver.java index 0149539474..400314ae57 100644 --- a/src/main/java/org/violetmoon/zeta/piston/ZetaPistonStructureResolver.java +++ b/src/main/java/org/violetmoon/zeta/piston/ZetaPistonStructureResolver.java @@ -14,14 +14,13 @@ import org.apache.commons.lang3.tuple.Pair; import org.violetmoon.zeta.Zeta; import org.violetmoon.zeta.api.ICollateralMover; +import org.violetmoon.zeta.api.ICollateralMover.MoveResult; import org.violetmoon.zeta.api.IConditionalSticky; import org.violetmoon.zeta.api.IIndirectConnector; -import org.violetmoon.zeta.api.ICollateralMover.MoveResult; import org.violetmoon.zeta.block.ext.IZetaBlockExtensions; import org.violetmoon.zeta.mixin.mixins.AccessorPistonStructureResolver; import javax.annotation.Nonnull; - import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/src/main/java/org/violetmoon/zeta/recipe/FlagIngredient.java b/src/main/java/org/violetmoon/zeta/recipe/FlagIngredient.java index 0b2f30319e..5c542c58a4 100644 --- a/src/main/java/org/violetmoon/zeta/recipe/FlagIngredient.java +++ b/src/main/java/org/violetmoon/zeta/recipe/FlagIngredient.java @@ -6,13 +6,11 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.violetmoon.quark.base.config.ConfigFlagManager; import org.violetmoon.zeta.Zeta; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.stream.Stream; /** diff --git a/src/main/java/org/violetmoon/zeta/recipe/IZetaCondition.java b/src/main/java/org/violetmoon/zeta/recipe/IZetaCondition.java index 49f0217c01..6a76a04b3e 100644 --- a/src/main/java/org/violetmoon/zeta/recipe/IZetaCondition.java +++ b/src/main/java/org/violetmoon/zeta/recipe/IZetaCondition.java @@ -1,15 +1,15 @@ package org.violetmoon.zeta.recipe; -import java.util.Collection; -import java.util.Map; -import java.util.Set; - import net.minecraft.core.Holder; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; +import java.util.Collection; +import java.util.Map; +import java.util.Set; + // Copy of Forge ICondition public interface IZetaCondition { diff --git a/src/main/java/org/violetmoon/zeta/recipe/IZetaIngredientSerializer.java b/src/main/java/org/violetmoon/zeta/recipe/IZetaIngredientSerializer.java index 881fd828b9..58af9c00f7 100644 --- a/src/main/java/org/violetmoon/zeta/recipe/IZetaIngredientSerializer.java +++ b/src/main/java/org/violetmoon/zeta/recipe/IZetaIngredientSerializer.java @@ -1,11 +1,10 @@ package org.violetmoon.zeta.recipe; -import org.violetmoon.zeta.Zeta; - import com.google.gson.JsonObject; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.Ingredient; +import org.violetmoon.zeta.Zeta; // Copy of Forge IIngredientSerializer public interface IZetaIngredientSerializer { diff --git a/src/main/java/org/violetmoon/zeta/recipe/ZetaDyeRecipe.java b/src/main/java/org/violetmoon/zeta/recipe/ZetaDyeRecipe.java index 374bbc883a..3db7edfa1d 100644 --- a/src/main/java/org/violetmoon/zeta/recipe/ZetaDyeRecipe.java +++ b/src/main/java/org/violetmoon/zeta/recipe/ZetaDyeRecipe.java @@ -1,9 +1,5 @@ package org.violetmoon.zeta.recipe; -import java.util.List; - -import org.violetmoon.zeta.registry.DyeablesRegistry; - import com.google.common.collect.Lists; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.CraftingContainer; @@ -14,6 +10,9 @@ import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.SimpleRecipeSerializer; import net.minecraft.world.level.Level; +import org.violetmoon.zeta.registry.DyeablesRegistry; + +import java.util.List; // copy of ArmorDyeRecipe public class ZetaDyeRecipe extends CustomRecipe { diff --git a/src/main/java/org/violetmoon/zeta/registry/BrewingRegistry.java b/src/main/java/org/violetmoon/zeta/registry/BrewingRegistry.java index 87cd2378cf..2be71d99fc 100644 --- a/src/main/java/org/violetmoon/zeta/registry/BrewingRegistry.java +++ b/src/main/java/org/violetmoon/zeta/registry/BrewingRegistry.java @@ -9,12 +9,10 @@ import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.Potions; import net.minecraft.world.item.crafting.Ingredient; - -import javax.annotation.Nullable; - import org.violetmoon.zeta.Zeta; import org.violetmoon.zeta.recipe.FlagIngredient; +import javax.annotation.Nullable; import java.util.Map; import java.util.function.Supplier; diff --git a/src/main/java/org/violetmoon/zeta/registry/CraftingExtensionsRegistry.java b/src/main/java/org/violetmoon/zeta/registry/CraftingExtensionsRegistry.java index 507dd80c4b..45731d1ba5 100644 --- a/src/main/java/org/violetmoon/zeta/registry/CraftingExtensionsRegistry.java +++ b/src/main/java/org/violetmoon/zeta/registry/CraftingExtensionsRegistry.java @@ -1,10 +1,9 @@ package org.violetmoon.zeta.registry; -import org.violetmoon.zeta.recipe.IZetaConditionSerializer; -import org.violetmoon.zeta.recipe.IZetaIngredientSerializer; - import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.Ingredient; +import org.violetmoon.zeta.recipe.IZetaConditionSerializer; +import org.violetmoon.zeta.recipe.IZetaIngredientSerializer; public interface CraftingExtensionsRegistry { // yes the generic is bad but blame forge diff --git a/src/main/java/org/violetmoon/zeta/registry/DyeablesRegistry.java b/src/main/java/org/violetmoon/zeta/registry/DyeablesRegistry.java index 2f757e21ce..5e906f6d11 100644 --- a/src/main/java/org/violetmoon/zeta/registry/DyeablesRegistry.java +++ b/src/main/java/org/violetmoon/zeta/registry/DyeablesRegistry.java @@ -1,16 +1,5 @@ package org.violetmoon.zeta.registry; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; - -import org.violetmoon.zeta.Zeta; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.recipe.ZetaDyeRecipe; - import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; import net.minecraft.core.cauldron.CauldronInteraction; @@ -25,6 +14,16 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.LayeredCauldronBlock; import net.minecraft.world.level.block.state.BlockState; +import org.violetmoon.zeta.Zeta; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.recipe.ZetaDyeRecipe; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; /** * @see org.violetmoon.zeta.client.ClientRegistryExtension diff --git a/src/main/java/org/violetmoon/zeta/registry/RenderLayerRegistry.java b/src/main/java/org/violetmoon/zeta/registry/RenderLayerRegistry.java index 2b11e8b17c..434af91efb 100644 --- a/src/main/java/org/violetmoon/zeta/registry/RenderLayerRegistry.java +++ b/src/main/java/org/violetmoon/zeta/registry/RenderLayerRegistry.java @@ -1,11 +1,11 @@ package org.violetmoon.zeta.registry; +import net.minecraft.world.level.block.Block; + import java.util.HashMap; import java.util.Map; import java.util.function.BiConsumer; -import net.minecraft.world.level.block.Block; - /** * note this is NOT client-side code, for ease of registering stuff in constructors * diff --git a/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java b/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java index 93a4fd8012..fc0aec90e2 100644 --- a/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java +++ b/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java @@ -1,14 +1,5 @@ package org.violetmoon.zeta.registry; -import java.util.Collection; -import java.util.HashMap; -import java.util.IdentityHashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.function.BiConsumer; -import java.util.function.BooleanSupplier; -import java.util.function.Supplier; - import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import net.minecraft.core.Registry; @@ -22,6 +13,11 @@ import org.jetbrains.annotations.Nullable; import org.violetmoon.zeta.Zeta; +import java.util.*; +import java.util.function.BiConsumer; +import java.util.function.BooleanSupplier; +import java.util.function.Supplier; + //Mash of arl's RegistryHelper and its ModData innerclass. //You're expected to create one of these per modid instead, avoiding a dependency on Forge's "current mod id" notion. public abstract class ZetaRegistry { diff --git a/src/main/java/org/violetmoon/zeta/util/ItemNBTHelper.java b/src/main/java/org/violetmoon/zeta/util/ItemNBTHelper.java index 0634883ca7..45ce71495f 100644 --- a/src/main/java/org/violetmoon/zeta/util/ItemNBTHelper.java +++ b/src/main/java/org/violetmoon/zeta/util/ItemNBTHelper.java @@ -10,9 +10,9 @@ */ package org.violetmoon.zeta.util; -import net.minecraft.world.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.world.item.ItemStack; public final class ItemNBTHelper { diff --git a/src/main/java/org/violetmoon/zeta/util/RegistryUtil.java b/src/main/java/org/violetmoon/zeta/util/RegistryUtil.java index 7bb2e89131..9c2829bc1b 100644 --- a/src/main/java/org/violetmoon/zeta/util/RegistryUtil.java +++ b/src/main/java/org/violetmoon/zeta/util/RegistryUtil.java @@ -1,12 +1,12 @@ package org.violetmoon.zeta.util; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; + import java.util.Collection; import java.util.List; import java.util.Objects; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; - public class RegistryUtil { public static List massRegistryGet(Collection coll, Registry reg) { diff --git a/src/main/java/org/violetmoon/zetaimplforge/ForgeZeta.java b/src/main/java/org/violetmoon/zetaimplforge/ForgeZeta.java index e9bfe10902..ea3a9e8ea6 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/ForgeZeta.java +++ b/src/main/java/org/violetmoon/zetaimplforge/ForgeZeta.java @@ -32,42 +32,12 @@ import org.violetmoon.zeta.capability.ZetaCapabilityManager; import org.violetmoon.zeta.config.IZetaConfigInternals; import org.violetmoon.zeta.config.SectionDefinition; -import org.violetmoon.zeta.event.*; import org.violetmoon.zeta.event.bus.ZResult; -import org.violetmoon.zeta.event.load.ZAddReloadListener; -import org.violetmoon.zeta.event.load.ZCommonSetup; -import org.violetmoon.zeta.event.load.ZEntityAttributeCreation; -import org.violetmoon.zeta.event.load.ZLoadComplete; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.event.load.ZTagsUpdated; -import org.violetmoon.zeta.event.play.ZAnvilRepair; -import org.violetmoon.zeta.event.play.ZAnvilUpdate; -import org.violetmoon.zeta.event.play.ZBlock; -import org.violetmoon.zeta.event.play.ZBonemeal; -import org.violetmoon.zeta.event.play.ZLevelTick; -import org.violetmoon.zeta.event.play.ZPlayNoteBlock; -import org.violetmoon.zeta.event.play.entity.ZEntityConstruct; -import org.violetmoon.zeta.event.play.entity.ZEntityInteract; -import org.violetmoon.zeta.event.play.entity.ZEntityItemPickup; -import org.violetmoon.zeta.event.play.entity.ZEntityJoinLevel; -import org.violetmoon.zeta.event.play.entity.ZEntityMobGriefing; -import org.violetmoon.zeta.event.play.entity.ZEntityTeleport; -import org.violetmoon.zeta.event.play.entity.living.ZAnimalTame; -import org.violetmoon.zeta.event.play.entity.living.ZBabyEntitySpawn; -import org.violetmoon.zeta.event.play.entity.living.ZLivingChangeTarget; -import org.violetmoon.zeta.event.play.entity.living.ZLivingConversion; -import org.violetmoon.zeta.event.play.entity.living.ZLivingDeath; -import org.violetmoon.zeta.event.play.entity.living.ZLivingDrops; -import org.violetmoon.zeta.event.play.entity.living.ZLivingFall; -import org.violetmoon.zeta.event.play.entity.living.ZLivingSpawn; -import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; -import org.violetmoon.zeta.event.play.entity.living.ZSleepingLocationCheck; -import org.violetmoon.zeta.event.play.entity.player.ZPlayer; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerDestroyItem; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerInteract; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickItem; +import org.violetmoon.zeta.event.load.*; +import org.violetmoon.zeta.event.play.*; +import org.violetmoon.zeta.event.play.entity.*; +import org.violetmoon.zeta.event.play.entity.living.*; +import org.violetmoon.zeta.event.play.entity.player.*; import org.violetmoon.zeta.event.play.loading.ZAttachCapabilities; import org.violetmoon.zeta.event.play.loading.ZLootTableLoad; import org.violetmoon.zeta.event.play.loading.ZVillagerTrades; @@ -81,39 +51,14 @@ import org.violetmoon.zetaimplforge.capability.ForgeCapabilityManager; import org.violetmoon.zetaimplforge.config.ForgeBackedConfig; import org.violetmoon.zetaimplforge.config.TerribleForgeConfigHackery; -import org.violetmoon.zetaimplforge.event.*; import org.violetmoon.zetaimplforge.event.load.ForgeZAddReloadListener; import org.violetmoon.zetaimplforge.event.load.ForgeZCommonSetup; import org.violetmoon.zetaimplforge.event.load.ForgeZEntityAttributeCreation; import org.violetmoon.zetaimplforge.event.load.ForgeZLoadComplete; -import org.violetmoon.zetaimplforge.event.play.ForgeZAnvilRepair; -import org.violetmoon.zetaimplforge.event.play.ForgeZAnvilUpdate; -import org.violetmoon.zetaimplforge.event.play.ForgeZBlock; -import org.violetmoon.zetaimplforge.event.play.ForgeZBonemeal; -import org.violetmoon.zetaimplforge.event.play.ForgeZLevelTick; -import org.violetmoon.zetaimplforge.event.play.ForgeZPlayNoteBlock; -import org.violetmoon.zetaimplforge.event.play.entity.ForgeZEntityConstruct; -import org.violetmoon.zetaimplforge.event.play.entity.ForgeZEntityInteract; -import org.violetmoon.zetaimplforge.event.play.entity.ForgeZEntityItemPickup; -import org.violetmoon.zetaimplforge.event.play.entity.ForgeZEntityJoinLevel; -import org.violetmoon.zetaimplforge.event.play.entity.ForgeZEntityMobGriefing; -import org.violetmoon.zetaimplforge.event.play.entity.ForgeZEntityTeleport; -import org.violetmoon.zetaimplforge.event.play.entity.living.ForgeZAnimalTame; -import org.violetmoon.zetaimplforge.event.play.entity.living.ForgeZBabyEntitySpawn; -import org.violetmoon.zetaimplforge.event.play.entity.living.ForgeZLivingChangeTarget; -import org.violetmoon.zetaimplforge.event.play.entity.living.ForgeZLivingConversion; -import org.violetmoon.zetaimplforge.event.play.entity.living.ForgeZLivingDeath; -import org.violetmoon.zetaimplforge.event.play.entity.living.ForgeZLivingDrops; -import org.violetmoon.zetaimplforge.event.play.entity.living.ForgeZLivingFall; -import org.violetmoon.zetaimplforge.event.play.entity.living.ForgeZLivingSpawn; -import org.violetmoon.zetaimplforge.event.play.entity.living.ForgeZLivingTick; -import org.violetmoon.zetaimplforge.event.play.entity.living.ForgeZSleepingLocationCheck; -import org.violetmoon.zetaimplforge.event.play.entity.player.ForgeZPlayer; -import org.violetmoon.zetaimplforge.event.play.entity.player.ForgeZPlayerDestroyItem; -import org.violetmoon.zetaimplforge.event.play.entity.player.ForgeZPlayerInteract; -import org.violetmoon.zetaimplforge.event.play.entity.player.ForgeZPlayerTick; -import org.violetmoon.zetaimplforge.event.play.entity.player.ForgeZRightClickBlock; -import org.violetmoon.zetaimplforge.event.play.entity.player.ForgeZRightClickItem; +import org.violetmoon.zetaimplforge.event.play.*; +import org.violetmoon.zetaimplforge.event.play.entity.*; +import org.violetmoon.zetaimplforge.event.play.entity.living.*; +import org.violetmoon.zetaimplforge.event.play.entity.player.*; import org.violetmoon.zetaimplforge.event.play.loading.ForgeZAttachCapabilities; import org.violetmoon.zetaimplforge.event.play.loading.ForgeZLootTableLoad; import org.violetmoon.zetaimplforge.event.play.loading.ForgeZVillagerTrades; diff --git a/src/main/java/org/violetmoon/zetaimplforge/capability/ForgeCapabilityManager.java b/src/main/java/org/violetmoon/zetaimplforge/capability/ForgeCapabilityManager.java index fb251393b0..70ff2a5355 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/capability/ForgeCapabilityManager.java +++ b/src/main/java/org/violetmoon/zetaimplforge/capability/ForgeCapabilityManager.java @@ -1,8 +1,5 @@ package org.violetmoon.zetaimplforge.capability; -import java.util.IdentityHashMap; -import java.util.Map; - import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; @@ -17,6 +14,9 @@ import org.violetmoon.zeta.capability.ZetaCapability; import org.violetmoon.zeta.capability.ZetaCapabilityManager; +import java.util.IdentityHashMap; +import java.util.Map; + public class ForgeCapabilityManager implements ZetaCapabilityManager { protected Map, Capability> toForge = new IdentityHashMap<>(); diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/ForgeClientRegistryExtension.java b/src/main/java/org/violetmoon/zetaimplforge/client/ForgeClientRegistryExtension.java index c083d7dc30..65f41e680f 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/ForgeClientRegistryExtension.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/ForgeClientRegistryExtension.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.client; +import net.minecraft.client.renderer.ItemBlockRenderTypes; +import net.minecraft.world.level.block.Block; import org.violetmoon.zeta.Zeta; import org.violetmoon.zeta.client.ClientRegistryExtension; import org.violetmoon.zeta.registry.RenderLayerRegistry; -import net.minecraft.client.renderer.ItemBlockRenderTypes; -import net.minecraft.world.level.block.Block; - public class ForgeClientRegistryExtension extends ClientRegistryExtension { public ForgeClientRegistryExtension(Zeta z) { super(z); diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/ForgeZetaClient.java b/src/main/java/org/violetmoon/zetaimplforge/client/ForgeZetaClient.java index b16f6da3e0..d7f59856fd 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/ForgeZetaClient.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/ForgeZetaClient.java @@ -6,6 +6,7 @@ import net.minecraft.client.color.item.ItemColors; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; +import net.minecraftforge.client.event.*; import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; @@ -18,62 +19,13 @@ import org.violetmoon.zeta.Zeta; import org.violetmoon.zeta.client.ClientRegistryExtension; import org.violetmoon.zeta.client.ZetaClient; -import org.violetmoon.zeta.client.event.*; -import org.violetmoon.zeta.client.event.load.ZAddBlockColorHandlers; -import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers; -import org.violetmoon.zeta.client.event.load.ZAddModelLayers; -import org.violetmoon.zeta.client.event.load.ZAddModels; -import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.client.event.load.ZKeyMapping; -import org.violetmoon.zeta.client.event.load.ZModelBakingCompleted; -import org.violetmoon.zeta.client.event.load.ZPreTextureStitch; -import org.violetmoon.zeta.client.event.load.ZRegisterLayerDefinitions; -import org.violetmoon.zeta.client.event.load.ZRegisterReloadListeners; -import org.violetmoon.zeta.client.event.load.ZTooltipComponents; -import org.violetmoon.zeta.client.event.play.ZCustomizeDebugText; -import org.violetmoon.zeta.client.event.play.ZEndClientTick; -import org.violetmoon.zeta.client.event.play.ZFirstClientTick; -import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; -import org.violetmoon.zeta.client.event.play.ZHighlightBlock; -import org.violetmoon.zeta.client.event.play.ZInput; -import org.violetmoon.zeta.client.event.play.ZInputUpdate; -import org.violetmoon.zeta.client.event.play.ZRenderContainerScreen; -import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; -import org.violetmoon.zeta.client.event.play.ZRenderLiving; -import org.violetmoon.zeta.client.event.play.ZRenderPlayer; -import org.violetmoon.zeta.client.event.play.ZRenderTick; -import org.violetmoon.zeta.client.event.play.ZRenderTooltip; -import org.violetmoon.zeta.client.event.play.ZScreen; -import org.violetmoon.zeta.client.event.play.ZScreenshot; -import org.violetmoon.zeta.client.event.play.ZStartClientTick; -import org.violetmoon.zetaimplforge.client.event.*; -import org.violetmoon.zetaimplforge.client.event.load.ForgeZAddBlockColorHandlers; -import org.violetmoon.zetaimplforge.client.event.load.ForgeZAddItemColorHandlers; -import org.violetmoon.zetaimplforge.client.event.load.ForgeZAddModelLayers; -import org.violetmoon.zetaimplforge.client.event.load.ForgeZAddModels; -import org.violetmoon.zetaimplforge.client.event.load.ForgeZClientSetup; -import org.violetmoon.zetaimplforge.client.event.load.ForgeZKeyMapping; -import org.violetmoon.zetaimplforge.client.event.load.ForgeZModelBakingCompleted; -import org.violetmoon.zetaimplforge.client.event.load.ForgeZPreTextureStitch; -import org.violetmoon.zetaimplforge.client.event.load.ForgeZRegisterLayerDefinitions; -import org.violetmoon.zetaimplforge.client.event.load.ForgeZTooltipComponents; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZCustomizeDebugText; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZGatherTooltipComponents; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZHighlightBlock; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZInput; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZInputUpdate; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZRenderContainerScreen; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZRenderGuiOverlay; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZRenderLiving; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZRenderPlayer; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZRenderTick; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZRenderTooltip; -import org.violetmoon.zetaimplforge.client.event.player.ForgeZScreen; +import org.violetmoon.zeta.client.event.load.*; +import org.violetmoon.zeta.client.event.play.*; +import org.violetmoon.zetaimplforge.client.event.load.*; +import org.violetmoon.zetaimplforge.client.event.player.*; import org.violetmoon.zetaimplforge.mixin.client.AccessorBlockColors; import org.violetmoon.zetaimplforge.mixin.client.AccessorItemColors; -import net.minecraftforge.client.event.*; - public class ForgeZetaClient extends ZetaClient { public ForgeZetaClient(Zeta z) { super(z); diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddBlockColorHandlers.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddBlockColorHandlers.java index 8c705d3ee6..0addb54039 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddBlockColorHandlers.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddBlockColorHandlers.java @@ -1,15 +1,14 @@ package org.violetmoon.zetaimplforge.client.event.load; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Function; - -import org.violetmoon.zeta.client.event.load.ZAddBlockColorHandlers; - import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.block.BlockColors; import net.minecraft.world.level.block.Block; import net.minecraftforge.client.event.RegisterColorHandlersEvent; +import org.violetmoon.zeta.client.event.load.ZAddBlockColorHandlers; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; public class ForgeZAddBlockColorHandlers implements ZAddBlockColorHandlers { protected final RegisterColorHandlersEvent.Block e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddItemColorHandlers.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddItemColorHandlers.java index de05e1cfec..664f555585 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddItemColorHandlers.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddItemColorHandlers.java @@ -1,16 +1,15 @@ package org.violetmoon.zetaimplforge.client.event.load; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Function; - -import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers; - import net.minecraft.client.color.item.ItemColor; import net.minecraft.client.color.item.ItemColors; import net.minecraft.world.item.Item; import net.minecraft.world.level.ItemLike; import net.minecraftforge.client.event.RegisterColorHandlersEvent; +import org.violetmoon.zeta.client.event.load.ZAddItemColorHandlers; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; public class ForgeZAddItemColorHandlers implements ZAddItemColorHandlers { protected final RegisterColorHandlersEvent.Item e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddModelLayers.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddModelLayers.java index 2a29732edc..a29104c85d 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddModelLayers.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddModelLayers.java @@ -1,13 +1,12 @@ package org.violetmoon.zetaimplforge.client.event.load; -import org.violetmoon.zeta.client.event.load.ZAddModelLayers; - import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.entity.LivingEntityRenderer; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraftforge.client.event.EntityRenderersEvent; +import org.violetmoon.zeta.client.event.load.ZAddModelLayers; public record ForgeZAddModelLayers(EntityRenderersEvent.AddLayers e) implements ZAddModelLayers { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddModels.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddModels.java index 9ca8178277..ea7f461dfe 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddModels.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZAddModels.java @@ -1,9 +1,8 @@ package org.violetmoon.zetaimplforge.client.event.load; -import org.violetmoon.zeta.client.event.load.ZAddModels; - import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.event.ModelEvent; +import org.violetmoon.zeta.client.event.load.ZAddModels; public record ForgeZAddModels(ModelEvent.RegisterAdditional e) implements ZAddModels { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZClientSetup.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZClientSetup.java index 4e45be9c8a..d926a85178 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZClientSetup.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZClientSetup.java @@ -1,8 +1,7 @@ package org.violetmoon.zetaimplforge.client.event.load; -import org.violetmoon.zeta.client.event.load.ZClientSetup; - import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import org.violetmoon.zeta.client.event.load.ZClientSetup; public record ForgeZClientSetup(FMLClientSetupEvent e) implements ZClientSetup { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZKeyMapping.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZKeyMapping.java index 516fbdfb6c..a0a76b7d84 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZKeyMapping.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZKeyMapping.java @@ -1,9 +1,8 @@ package org.violetmoon.zetaimplforge.client.event.load; -import org.violetmoon.zeta.client.event.load.ZKeyMapping; - import net.minecraft.client.KeyMapping; import net.minecraftforge.client.event.RegisterKeyMappingsEvent; +import org.violetmoon.zeta.client.event.load.ZKeyMapping; public record ForgeZKeyMapping(RegisterKeyMappingsEvent e) implements ZKeyMapping { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZModelBakingCompleted.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZModelBakingCompleted.java index 01a887d1f0..9ddea7bc7a 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZModelBakingCompleted.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZModelBakingCompleted.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.client.event.load; -import java.util.Map; - -import org.violetmoon.zeta.client.event.load.ZModelBakingCompleted; - import net.minecraft.client.resources.model.BakedModel; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.event.ModelEvent; +import org.violetmoon.zeta.client.event.load.ZModelBakingCompleted; + +import java.util.Map; public record ForgeZModelBakingCompleted(ModelEvent.BakingCompleted e) implements ZModelBakingCompleted { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZPreTextureStitch.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZPreTextureStitch.java index 39c9ccb95a..3ee9d67072 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZPreTextureStitch.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZPreTextureStitch.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.client.event.load; -import org.violetmoon.zeta.client.event.load.ZPreTextureStitch; - import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.event.TextureStitchEvent; +import org.violetmoon.zeta.client.event.load.ZPreTextureStitch; public record ForgeZPreTextureStitch(TextureStitchEvent.Pre e) implements ZPreTextureStitch { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZRegisterLayerDefinitions.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZRegisterLayerDefinitions.java index 6bc8fc292f..c6d11c96f8 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZRegisterLayerDefinitions.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZRegisterLayerDefinitions.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.client.event.load; -import java.util.function.Supplier; - -import org.violetmoon.zeta.client.event.load.ZRegisterLayerDefinitions; - import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.builders.LayerDefinition; import net.minecraftforge.client.event.EntityRenderersEvent; +import org.violetmoon.zeta.client.event.load.ZRegisterLayerDefinitions; + +import java.util.function.Supplier; public class ForgeZRegisterLayerDefinitions implements ZRegisterLayerDefinitions { private final EntityRenderersEvent.RegisterLayerDefinitions e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZTooltipComponents.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZTooltipComponents.java index b5e33f0dbb..8e454ca85f 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZTooltipComponents.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/load/ForgeZTooltipComponents.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.client.event.load; -import java.util.function.Function; - -import org.violetmoon.zeta.client.event.load.ZTooltipComponents; - import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraftforge.client.event.RegisterClientTooltipComponentFactoriesEvent; +import org.violetmoon.zeta.client.event.load.ZTooltipComponents; + +import java.util.function.Function; public record ForgeZTooltipComponents(RegisterClientTooltipComponentFactoriesEvent e) implements ZTooltipComponents { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZCustomizeDebugText.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZCustomizeDebugText.java index 2ec079318c..81e6ce922e 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZCustomizeDebugText.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZCustomizeDebugText.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.client.event.player; -import java.util.ArrayList; - -import org.violetmoon.zeta.client.event.play.ZCustomizeDebugText; - import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraftforge.client.event.CustomizeGuiOverlayEvent; +import org.violetmoon.zeta.client.event.play.ZCustomizeDebugText; + +import java.util.ArrayList; public class ForgeZCustomizeDebugText implements ZCustomizeDebugText { private final CustomizeGuiOverlayEvent.DebugText e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZGatherTooltipComponents.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZGatherTooltipComponents.java index f9177d9b0b..1ad283d8c6 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZGatherTooltipComponents.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZGatherTooltipComponents.java @@ -1,14 +1,13 @@ package org.violetmoon.zetaimplforge.client.event.player; -import java.util.List; - -import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; - import com.mojang.datafixers.util.Either; import net.minecraft.network.chat.FormattedText; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemStack; import net.minecraftforge.client.event.RenderTooltipEvent; +import org.violetmoon.zeta.client.event.play.ZGatherTooltipComponents; + +import java.util.List; public record ForgeZGatherTooltipComponents(RenderTooltipEvent.GatherComponents e) implements ZGatherTooltipComponents { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZHighlightBlock.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZHighlightBlock.java index f2b6fb74eb..c4faf2a67d 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZHighlightBlock.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZHighlightBlock.java @@ -1,11 +1,10 @@ package org.violetmoon.zetaimplforge.client.event.player; -import org.violetmoon.zeta.client.event.play.ZHighlightBlock; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Camera; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraftforge.client.event.RenderHighlightEvent; +import org.violetmoon.zeta.client.event.play.ZHighlightBlock; public record ForgeZHighlightBlock(RenderHighlightEvent.Block e) implements ZHighlightBlock { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZInput.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZInput.java index 9700c2992d..aaa9908653 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZInput.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZInput.java @@ -1,8 +1,7 @@ package org.violetmoon.zetaimplforge.client.event.player; -import org.violetmoon.zeta.client.event.play.ZInput; - import net.minecraftforge.client.event.InputEvent; +import org.violetmoon.zeta.client.event.play.ZInput; public class ForgeZInput implements ZInput { public static class MouseButton extends ForgeZInput implements ZInput.MouseButton { diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZInputUpdate.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZInputUpdate.java index 58ca6f3996..83441d6eb0 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZInputUpdate.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZInputUpdate.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.client.event.player; -import org.violetmoon.zeta.client.event.play.ZInputUpdate; - import net.minecraft.client.player.Input; import net.minecraft.world.entity.player.Player; import net.minecraftforge.client.event.MovementInputUpdateEvent; +import org.violetmoon.zeta.client.event.play.ZInputUpdate; public record ForgeZInputUpdate(MovementInputUpdateEvent e) implements ZInputUpdate { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderContainerScreen.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderContainerScreen.java index ff3fc182e6..e0449b66da 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderContainerScreen.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderContainerScreen.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.client.event.player; -import org.violetmoon.zeta.client.event.play.ZRenderContainerScreen; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraftforge.client.event.ContainerScreenEvent; +import org.violetmoon.zeta.client.event.play.ZRenderContainerScreen; public abstract class ForgeZRenderContainerScreen implements ZRenderContainerScreen { protected final ContainerScreenEvent.Render e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderGuiOverlay.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderGuiOverlay.java index f2e70c5a9f..df56aae851 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderGuiOverlay.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderGuiOverlay.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.client.event.player; -import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; - import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraftforge.client.event.RenderGuiOverlayEvent; import net.minecraftforge.client.gui.overlay.ForgeGui; +import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; public class ForgeZRenderGuiOverlay implements ZRenderGuiOverlay { private final RenderGuiOverlayEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderLiving.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderLiving.java index c0d92fb66d..0e7b606212 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderLiving.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderLiving.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.client.event.player; -import org.violetmoon.zeta.client.event.play.ZRenderLiving; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.world.entity.Entity; import net.minecraftforge.client.event.RenderLivingEvent; +import org.violetmoon.zeta.client.event.play.ZRenderLiving; public abstract class ForgeZRenderLiving implements ZRenderLiving { protected final RenderLivingEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderPlayer.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderPlayer.java index 708554a3b4..700d6d4cfd 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderPlayer.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderPlayer.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.client.event.player; -import org.violetmoon.zeta.client.event.play.ZRenderPlayer; - import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.world.entity.player.Player; import net.minecraftforge.client.event.RenderPlayerEvent; +import org.violetmoon.zeta.client.event.play.ZRenderPlayer; public abstract class ForgeZRenderPlayer implements ZRenderPlayer { private final RenderPlayerEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderTick.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderTick.java index 93eb44d376..8b5b8c9b52 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderTick.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderTick.java @@ -1,8 +1,7 @@ package org.violetmoon.zetaimplforge.client.event.player; -import org.violetmoon.zeta.client.event.play.ZRenderTick; - import net.minecraftforge.event.TickEvent; +import org.violetmoon.zeta.client.event.play.ZRenderTick; public record ForgeZRenderTick(TickEvent.RenderTickEvent e) implements ZRenderTick { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderTooltip.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderTooltip.java index bcd774c083..79e311938d 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderTooltip.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderTooltip.java @@ -5,11 +5,10 @@ import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemStack; import net.minecraftforge.client.event.RenderTooltipEvent; +import org.violetmoon.zeta.client.event.play.ZRenderTooltip; import java.util.List; -import org.violetmoon.zeta.client.event.play.ZRenderTooltip; - public class ForgeZRenderTooltip implements ZRenderTooltip { public static class GatherComponents extends ForgeZRenderTooltip implements ZRenderTooltip.GatherComponents { private final RenderTooltipEvent.GatherComponents e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZScreen.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZScreen.java index 68e5e155dc..e5a903cbd4 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZScreen.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZScreen.java @@ -4,11 +4,10 @@ import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; import net.minecraftforge.client.event.ScreenEvent; +import org.violetmoon.zeta.client.event.play.ZScreen; import java.util.List; -import org.violetmoon.zeta.client.event.play.ZScreen; - public class ForgeZScreen implements ZScreen { private final ScreenEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/config/ForgeBackedConfig.java b/src/main/java/org/violetmoon/zetaimplforge/config/ForgeBackedConfig.java index 903bb128cc..e0b0865e90 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/config/ForgeBackedConfig.java +++ b/src/main/java/org/violetmoon/zetaimplforge/config/ForgeBackedConfig.java @@ -1,14 +1,13 @@ package org.violetmoon.zetaimplforge.config; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import net.minecraftforge.common.ForgeConfigSpec; import org.violetmoon.zeta.config.IZetaConfigInternals; import org.violetmoon.zeta.config.SectionDefinition; import org.violetmoon.zeta.config.ValueDefinition; -import net.minecraftforge.common.ForgeConfigSpec; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class ForgeBackedConfig implements IZetaConfigInternals { private final Map, ForgeConfigSpec.ConfigValue> definitionsToValues = new HashMap<>(); diff --git a/src/main/java/org/violetmoon/zetaimplforge/config/TerribleForgeConfigHackery.java b/src/main/java/org/violetmoon/zetaimplforge/config/TerribleForgeConfigHackery.java index c38ca72b3c..c98a228442 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/config/TerribleForgeConfigHackery.java +++ b/src/main/java/org/violetmoon/zetaimplforge/config/TerribleForgeConfigHackery.java @@ -1,9 +1,5 @@ package org.violetmoon.zetaimplforge.config; -import java.io.Serial; -import java.lang.reflect.Method; -import java.nio.file.Path; - import com.electronwill.nightconfig.core.CommentedConfig; import com.electronwill.nightconfig.core.ConfigFormat; import com.electronwill.nightconfig.core.file.CommentedFileConfig; @@ -16,6 +12,10 @@ import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.fml.util.ObfuscationReflectionHelper; +import java.io.Serial; +import java.lang.reflect.Method; +import java.nio.file.Path; + public class TerribleForgeConfigHackery { private static final Method SET_CONFIG_DATA = ObfuscationReflectionHelper.findMethod(ModConfig.class, "setConfigData", CommentedConfig.class); private static final Method SETUP_CONFIG_FILE = ObfuscationReflectionHelper.findMethod(ConfigFileTypeHandler.class, diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZAddReloadListener.java b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZAddReloadListener.java index b11f66f8ae..3a8a6550cb 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZAddReloadListener.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZAddReloadListener.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.event.load; -import org.violetmoon.zeta.event.load.ZAddReloadListener; - import net.minecraft.server.ReloadableServerResources; import net.minecraft.server.packs.resources.PreparableReloadListener; import net.minecraftforge.event.AddReloadListenerEvent; +import org.violetmoon.zeta.event.load.ZAddReloadListener; public class ForgeZAddReloadListener implements ZAddReloadListener { private final AddReloadListenerEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZCommonSetup.java b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZCommonSetup.java index 868ef032da..1b08b193fc 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZCommonSetup.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZCommonSetup.java @@ -1,8 +1,7 @@ package org.violetmoon.zetaimplforge.event.load; -import org.violetmoon.zeta.event.load.ZCommonSetup; - import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import org.violetmoon.zeta.event.load.ZCommonSetup; public record ForgeZCommonSetup(FMLCommonSetupEvent e) implements ZCommonSetup { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZEntityAttributeCreation.java b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZEntityAttributeCreation.java index 59851c1b78..a3b38c1c1a 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZEntityAttributeCreation.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZEntityAttributeCreation.java @@ -1,11 +1,10 @@ package org.violetmoon.zetaimplforge.event.load; -import org.violetmoon.zeta.event.load.ZEntityAttributeCreation; - import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraftforge.event.entity.EntityAttributeCreationEvent; +import org.violetmoon.zeta.event.load.ZEntityAttributeCreation; public class ForgeZEntityAttributeCreation implements ZEntityAttributeCreation { private final EntityAttributeCreationEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZLoadComplete.java b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZLoadComplete.java index 43d63c5d98..afe783eff6 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZLoadComplete.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZLoadComplete.java @@ -1,8 +1,7 @@ package org.violetmoon.zetaimplforge.event.load; -import org.violetmoon.zeta.event.load.ZLoadComplete; - import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; +import org.violetmoon.zeta.event.load.ZLoadComplete; public record ForgeZLoadComplete(FMLLoadCompleteEvent e) implements ZLoadComplete { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZAnvilRepair.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZAnvilRepair.java index 5d10d0040f..2c931d31fd 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZAnvilRepair.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZAnvilRepair.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.event.play; -import org.violetmoon.zeta.event.play.ZAnvilRepair; - import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.event.entity.player.AnvilRepairEvent; +import org.violetmoon.zeta.event.play.ZAnvilRepair; public class ForgeZAnvilRepair implements ZAnvilRepair { private final AnvilRepairEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZAnvilUpdate.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZAnvilUpdate.java index 4075c2bd46..b66c0c6b3f 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZAnvilUpdate.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZAnvilUpdate.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.event.play; -import org.violetmoon.zeta.event.play.ZAnvilUpdate; - import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.event.AnvilUpdateEvent; +import org.violetmoon.zeta.event.play.ZAnvilUpdate; public class ForgeZAnvilUpdate implements ZAnvilUpdate { private final AnvilUpdateEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZBlock.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZBlock.java index d8c4f16a30..99183b7c43 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZBlock.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZBlock.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.event.play; -import org.violetmoon.zeta.event.play.ZBlock; - import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.event.level.BlockEvent; +import org.violetmoon.zeta.event.play.ZBlock; public class ForgeZBlock implements ZBlock { private final BlockEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZBonemeal.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZBonemeal.java index 28baf4ff1d..bed3c3e4be 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZBonemeal.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZBonemeal.java @@ -1,14 +1,13 @@ package org.violetmoon.zetaimplforge.event.play; -import org.violetmoon.zeta.event.bus.ZResult; -import org.violetmoon.zeta.event.play.ZBonemeal; -import org.violetmoon.zetaimplforge.ForgeZeta; - import net.minecraft.core.BlockPos; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.event.entity.player.BonemealEvent; +import org.violetmoon.zeta.event.bus.ZResult; +import org.violetmoon.zeta.event.play.ZBonemeal; +import org.violetmoon.zetaimplforge.ForgeZeta; public class ForgeZBonemeal implements ZBonemeal { private final BonemealEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZFurnaceFuelBurnTime.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZFurnaceFuelBurnTime.java index 4fc798d75f..585c198926 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZFurnaceFuelBurnTime.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZFurnaceFuelBurnTime.java @@ -2,7 +2,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent; - import org.jetbrains.annotations.NotNull; import org.violetmoon.zeta.event.play.ZFurnaceFuelBurnTime; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZItemTooltip.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZItemTooltip.java index dc6298c724..c9d8b01018 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZItemTooltip.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZItemTooltip.java @@ -1,17 +1,16 @@ package org.violetmoon.zetaimplforge.event.play; -import java.util.List; - import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraftforge.event.entity.player.ItemTooltipEvent; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.violetmoon.zeta.event.play.ZItemTooltip; +import java.util.List; + public class ForgeZItemTooltip implements ZItemTooltip { private final ItemTooltipEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZLevelTick.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZLevelTick.java index 5064e61d67..9cba2cbc2f 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZLevelTick.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZLevelTick.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.event.play; -import org.violetmoon.zeta.event.play.ZLevelTick; - import net.minecraft.world.level.Level; import net.minecraftforge.event.TickEvent; +import org.violetmoon.zeta.event.play.ZLevelTick; public class ForgeZLevelTick implements ZLevelTick { private final TickEvent.LevelTickEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZPlayNoteBlock.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZPlayNoteBlock.java index 09f23cd526..c315aa4756 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZPlayNoteBlock.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZPlayNoteBlock.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.event.play; -import org.violetmoon.zeta.event.play.ZPlayNoteBlock; - import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; import net.minecraftforge.event.level.NoteBlockEvent; +import org.violetmoon.zeta.event.play.ZPlayNoteBlock; public record ForgeZPlayNoteBlock(NoteBlockEvent.Play e) implements ZPlayNoteBlock { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityConstruct.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityConstruct.java index 0f71953113..0a35898cd5 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityConstruct.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityConstruct.java @@ -1,9 +1,8 @@ package org.violetmoon.zetaimplforge.event.play.entity; -import org.violetmoon.zeta.event.play.entity.ZEntityConstruct; - import net.minecraft.world.entity.Entity; import net.minecraftforge.event.entity.EntityEvent; +import org.violetmoon.zeta.event.play.entity.ZEntityConstruct; public class ForgeZEntityConstruct implements ZEntityConstruct { private final EntityEvent.EntityConstructing e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityInteract.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityInteract.java index 2a8c9dfcdd..b9406cbd1e 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityInteract.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityInteract.java @@ -1,13 +1,12 @@ package org.violetmoon.zetaimplforge.event.play.entity; -import org.violetmoon.zeta.event.play.entity.ZEntityInteract; - import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import org.violetmoon.zeta.event.play.entity.ZEntityInteract; public class ForgeZEntityInteract implements ZEntityInteract { private final PlayerInteractEvent.EntityInteract e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityItemPickup.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityItemPickup.java index 210d97eebe..8c3e6ef8d2 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityItemPickup.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityItemPickup.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.event.play.entity; -import org.violetmoon.zeta.event.play.entity.ZEntityItemPickup; - import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import org.violetmoon.zeta.event.play.entity.ZEntityItemPickup; public class ForgeZEntityItemPickup implements ZEntityItemPickup { private final EntityItemPickupEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityJoinLevel.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityJoinLevel.java index 80e09a9bef..994ac07111 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityJoinLevel.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityJoinLevel.java @@ -1,9 +1,8 @@ package org.violetmoon.zetaimplforge.event.play.entity; -import org.violetmoon.zeta.event.play.entity.ZEntityJoinLevel; - import net.minecraft.world.entity.Entity; import net.minecraftforge.event.entity.EntityJoinLevelEvent; +import org.violetmoon.zeta.event.play.entity.ZEntityJoinLevel; public class ForgeZEntityJoinLevel implements ZEntityJoinLevel { private final EntityJoinLevelEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityMobGriefing.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityMobGriefing.java index cb0f1743af..007819cd36 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityMobGriefing.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityMobGriefing.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.event.play.entity; +import net.minecraft.world.entity.Entity; +import net.minecraftforge.event.entity.EntityMobGriefingEvent; import org.violetmoon.zeta.event.bus.ZResult; import org.violetmoon.zeta.event.play.entity.ZEntityMobGriefing; import org.violetmoon.zetaimplforge.ForgeZeta; -import net.minecraft.world.entity.Entity; -import net.minecraftforge.event.entity.EntityMobGriefingEvent; - public class ForgeZEntityMobGriefing implements ZEntityMobGriefing { private final EntityMobGriefingEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityTeleport.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityTeleport.java index c4a3ce5243..361c209310 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityTeleport.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/ForgeZEntityTeleport.java @@ -1,9 +1,8 @@ package org.violetmoon.zetaimplforge.event.play.entity; -import org.violetmoon.zeta.event.play.entity.ZEntityTeleport; - import net.minecraft.world.entity.Entity; import net.minecraftforge.event.entity.EntityTeleportEvent; +import org.violetmoon.zeta.event.play.entity.ZEntityTeleport; public class ForgeZEntityTeleport implements ZEntityTeleport { private final EntityTeleportEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZAnimalTame.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZAnimalTame.java index 490a020c6b..4cae37c829 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZAnimalTame.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZAnimalTame.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.event.play.entity.living; -import org.violetmoon.zeta.event.play.entity.living.ZAnimalTame; - import net.minecraft.world.entity.animal.Animal; import net.minecraft.world.entity.player.Player; import net.minecraftforge.event.entity.living.AnimalTameEvent; +import org.violetmoon.zeta.event.play.entity.living.ZAnimalTame; public class ForgeZAnimalTame implements ZAnimalTame { private final AnimalTameEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZBabyEntitySpawn.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZBabyEntitySpawn.java index ad93dd3490..f1e4d999a4 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZBabyEntitySpawn.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZBabyEntitySpawn.java @@ -1,11 +1,10 @@ package org.violetmoon.zetaimplforge.event.play.entity.living; -import org.violetmoon.zeta.event.play.entity.living.ZBabyEntitySpawn; - import net.minecraft.world.entity.AgeableMob; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.player.Player; import net.minecraftforge.event.entity.living.BabyEntitySpawnEvent; +import org.violetmoon.zeta.event.play.entity.living.ZBabyEntitySpawn; public class ForgeZBabyEntitySpawn implements ZBabyEntitySpawn { private final BabyEntitySpawnEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingChangeTarget.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingChangeTarget.java index d6dbfa1bb4..2d2786e027 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingChangeTarget.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingChangeTarget.java @@ -1,9 +1,8 @@ package org.violetmoon.zetaimplforge.event.play.entity.living; -import org.violetmoon.zeta.event.play.entity.living.ZLivingChangeTarget; - import net.minecraft.world.entity.LivingEntity; import net.minecraftforge.event.entity.living.LivingChangeTargetEvent; +import org.violetmoon.zeta.event.play.entity.living.ZLivingChangeTarget; public class ForgeZLivingChangeTarget implements ZLivingChangeTarget { private final LivingChangeTargetEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingConversion.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingConversion.java index a1cf79c191..987538bb25 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingConversion.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingConversion.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.event.play.entity.living; -import org.violetmoon.zeta.event.play.entity.living.ZLivingConversion; - import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraftforge.event.entity.living.LivingConversionEvent; +import org.violetmoon.zeta.event.play.entity.living.ZLivingConversion; public class ForgeZLivingConversion implements ZLivingConversion { private final LivingConversionEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingDeath.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingDeath.java index ded67822b9..ca6e4d39e0 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingDeath.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingDeath.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.event.play.entity.living; -import org.violetmoon.zeta.event.play.entity.living.ZLivingDeath; - import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraftforge.event.entity.living.LivingDeathEvent; +import org.violetmoon.zeta.event.play.entity.living.ZLivingDeath; public class ForgeZLivingDeath implements ZLivingDeath { private final LivingDeathEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingDrops.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingDrops.java index 3466fdfd4c..2658d8bedd 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingDrops.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingDrops.java @@ -4,11 +4,10 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import org.violetmoon.zeta.event.play.entity.living.ZLivingDrops; import java.util.Collection; -import org.violetmoon.zeta.event.play.entity.living.ZLivingDrops; - public class ForgeZLivingDrops implements ZLivingDrops { private final LivingDropsEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingFall.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingFall.java index e8c65cdcf2..9897d7d5f9 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingFall.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingFall.java @@ -1,9 +1,8 @@ package org.violetmoon.zetaimplforge.event.play.entity.living; -import org.violetmoon.zeta.event.play.entity.living.ZLivingFall; - import net.minecraft.world.entity.LivingEntity; import net.minecraftforge.event.entity.living.LivingFallEvent; +import org.violetmoon.zeta.event.play.entity.living.ZLivingFall; public class ForgeZLivingFall implements ZLivingFall { private final LivingFallEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingSpawn.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingSpawn.java index ea99923abc..f815770785 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingSpawn.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingSpawn.java @@ -1,14 +1,13 @@ package org.violetmoon.zetaimplforge.event.play.entity.living; -import org.violetmoon.zeta.event.bus.ZResult; -import org.violetmoon.zeta.event.play.entity.living.ZLivingSpawn; -import org.violetmoon.zetaimplforge.ForgeZeta; - import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.level.BaseSpawner; import net.minecraft.world.level.LevelAccessor; import net.minecraftforge.event.entity.living.LivingSpawnEvent; +import org.violetmoon.zeta.event.bus.ZResult; +import org.violetmoon.zeta.event.play.entity.living.ZLivingSpawn; +import org.violetmoon.zetaimplforge.ForgeZeta; public class ForgeZLivingSpawn implements ZLivingSpawn { private final LivingSpawnEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingTick.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingTick.java index ed1dfd1a86..c9b87b75ee 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingTick.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZLivingTick.java @@ -1,9 +1,8 @@ package org.violetmoon.zetaimplforge.event.play.entity.living; -import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; - import net.minecraft.world.entity.LivingEntity; import net.minecraftforge.event.entity.living.LivingEvent; +import org.violetmoon.zeta.event.play.entity.living.ZLivingTick; public record ForgeZLivingTick(LivingEvent.LivingTickEvent e) implements ZLivingTick { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZSleepingLocationCheck.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZSleepingLocationCheck.java index a4867fb376..da9f95cd3b 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZSleepingLocationCheck.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/living/ForgeZSleepingLocationCheck.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.event.play.entity.living; -import org.violetmoon.zeta.event.bus.ZResult; -import org.violetmoon.zeta.event.play.entity.living.ZSleepingLocationCheck; -import org.violetmoon.zetaimplforge.ForgeZeta; - import net.minecraft.core.BlockPos; import net.minecraft.world.entity.LivingEntity; import net.minecraftforge.event.entity.player.SleepingLocationCheckEvent; +import org.violetmoon.zeta.event.bus.ZResult; +import org.violetmoon.zeta.event.play.entity.living.ZSleepingLocationCheck; +import org.violetmoon.zetaimplforge.ForgeZeta; public class ForgeZSleepingLocationCheck implements ZSleepingLocationCheck { private final SleepingLocationCheckEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayer.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayer.java index 31e6868a5a..6cd3d03d6f 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayer.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayer.java @@ -1,10 +1,9 @@ package org.violetmoon.zetaimplforge.event.play.entity.player; -import org.violetmoon.zeta.event.play.entity.player.ZPlayer; - import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.event.entity.player.PlayerEvent; +import org.violetmoon.zeta.event.play.entity.player.ZPlayer; public class ForgeZPlayer implements ZPlayer { private final PlayerEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerDestroyItem.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerDestroyItem.java index 95cff46b9f..afba2d95dd 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerDestroyItem.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerDestroyItem.java @@ -1,11 +1,10 @@ package org.violetmoon.zetaimplforge.event.play.entity.player; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerDestroyItem; - import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import org.violetmoon.zeta.event.play.entity.player.ZPlayerDestroyItem; public class ForgeZPlayerDestroyItem implements ZPlayerDestroyItem { private final PlayerDestroyItemEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerInteract.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerInteract.java index 26a6296f23..351329b689 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerInteract.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerInteract.java @@ -1,7 +1,5 @@ package org.violetmoon.zetaimplforge.event.play.entity.player; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerInteract; - import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; @@ -10,6 +8,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import org.violetmoon.zeta.event.play.entity.player.ZPlayerInteract; public class ForgeZPlayerInteract implements ZPlayerInteract { private final PlayerInteractEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerTick.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerTick.java index 174ebcf3a3..7e06fc7677 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerTick.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZPlayerTick.java @@ -1,9 +1,8 @@ package org.violetmoon.zetaimplforge.event.play.entity.player; -import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; - import net.minecraft.world.entity.player.Player; import net.minecraftforge.event.TickEvent; +import org.violetmoon.zeta.event.play.entity.player.ZPlayerTick; public abstract class ForgeZPlayerTick implements ZPlayerTick { private final TickEvent.PlayerTickEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZRightClickBlock.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZRightClickBlock.java index 10a7d229e1..30d6eecd5f 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZRightClickBlock.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZRightClickBlock.java @@ -1,9 +1,5 @@ package org.violetmoon.zetaimplforge.event.play.entity.player; -import org.violetmoon.zeta.event.bus.ZResult; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; -import org.violetmoon.zetaimplforge.ForgeZeta; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -13,6 +9,9 @@ import net.minecraft.world.level.Level; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import org.violetmoon.zeta.event.bus.ZResult; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; +import org.violetmoon.zetaimplforge.ForgeZeta; public class ForgeZRightClickBlock implements ZRightClickBlock { private final PlayerInteractEvent.RightClickBlock e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZRightClickItem.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZRightClickItem.java index ff447f8cec..14065481b9 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZRightClickItem.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/entity/player/ForgeZRightClickItem.java @@ -1,13 +1,12 @@ package org.violetmoon.zetaimplforge.event.play.entity.player; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickItem; - import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import org.violetmoon.zeta.event.play.entity.player.ZRightClickItem; public class ForgeZRightClickItem implements ZRightClickItem { private final PlayerInteractEvent.RightClickItem e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZAttachCapabilities.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZAttachCapabilities.java index 95d342de71..034743a529 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZAttachCapabilities.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZAttachCapabilities.java @@ -1,15 +1,14 @@ package org.violetmoon.zetaimplforge.event.play.loading; -import org.violetmoon.zeta.capability.ZetaCapability; -import org.violetmoon.zeta.capability.ZetaCapabilityManager; -import org.violetmoon.zeta.event.play.loading.ZAttachCapabilities; - import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.event.AttachCapabilitiesEvent; +import org.violetmoon.zeta.capability.ZetaCapability; +import org.violetmoon.zeta.capability.ZetaCapabilityManager; +import org.violetmoon.zeta.event.play.loading.ZAttachCapabilities; public abstract class ForgeZAttachCapabilities implements ZAttachCapabilities { protected final ZetaCapabilityManager zetaCaps; diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZLootTableLoad.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZLootTableLoad.java index e4b6e9b1a1..dbfc67946b 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZLootTableLoad.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZLootTableLoad.java @@ -1,11 +1,10 @@ package org.violetmoon.zetaimplforge.event.play.loading; -import org.violetmoon.zeta.event.play.loading.ZLootTableLoad; - import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.LootTables; import net.minecraftforge.event.LootTableLoadEvent; +import org.violetmoon.zeta.event.play.loading.ZLootTableLoad; public record ForgeZLootTableLoad(LootTableLoadEvent e) implements ZLootTableLoad { @Override diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZVillagerTrades.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZVillagerTrades.java index b0bdd06fb5..5b055f33ab 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZVillagerTrades.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZVillagerTrades.java @@ -4,11 +4,10 @@ import net.minecraft.world.entity.npc.VillagerProfession; import net.minecraft.world.entity.npc.VillagerTrades; import net.minecraftforge.event.village.VillagerTradesEvent; +import org.violetmoon.zeta.event.play.loading.ZVillagerTrades; import java.util.List; -import org.violetmoon.zeta.event.play.loading.ZVillagerTrades; - public class ForgeZVillagerTrades implements ZVillagerTrades { private final VillagerTradesEvent e; diff --git a/src/main/java/org/violetmoon/zetaimplforge/item/IForgeItemItemExtensions.java b/src/main/java/org/violetmoon/zetaimplforge/item/IForgeItemItemExtensions.java index 6f3a9fd101..6465f3f384 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/item/IForgeItemItemExtensions.java +++ b/src/main/java/org/violetmoon/zetaimplforge/item/IForgeItemItemExtensions.java @@ -1,7 +1,5 @@ package org.violetmoon.zetaimplforge.item; -import java.util.Map; - import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.monster.EnderMan; import net.minecraft.world.entity.player.Player; @@ -13,6 +11,8 @@ import org.jetbrains.annotations.Nullable; import org.violetmoon.zeta.item.ext.IZetaItemExtensions; +import java.util.Map; + public class IForgeItemItemExtensions implements IZetaItemExtensions { public static final IForgeItemItemExtensions INSTANCE = new IForgeItemItemExtensions(); diff --git a/src/main/java/org/violetmoon/zetaimplforge/mixin/client/AccessorBlockColors.java b/src/main/java/org/violetmoon/zetaimplforge/mixin/client/AccessorBlockColors.java index 6f5b7fb371..8de60d5426 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/mixin/client/AccessorBlockColors.java +++ b/src/main/java/org/violetmoon/zetaimplforge/mixin/client/AccessorBlockColors.java @@ -1,14 +1,13 @@ package org.violetmoon.zetaimplforge.mixin.client; -import java.util.Map; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.block.BlockColors; import net.minecraft.core.Holder.Reference; import net.minecraft.world.level.block.Block; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import java.util.Map; @Mixin(BlockColors.class) public interface AccessorBlockColors { diff --git a/src/main/java/org/violetmoon/zetaimplforge/mixin/self/IQuarkBlockMixin.java b/src/main/java/org/violetmoon/zetaimplforge/mixin/self/IQuarkBlockMixin.java index ee427931eb..72ff5c1e54 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/mixin/self/IQuarkBlockMixin.java +++ b/src/main/java/org/violetmoon/zetaimplforge/mixin/self/IQuarkBlockMixin.java @@ -1,7 +1,5 @@ package org.violetmoon.zetaimplforge.mixin.self; -import java.util.Locale; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.entity.Entity; @@ -25,6 +23,8 @@ import org.violetmoon.quark.content.world.block.HugeGlowShroomBlock; import org.violetmoon.zeta.block.ext.IZetaBlockExtensions; +import java.util.Locale; + // Kid named forge interface mixins: @Mixin({ HedgeBlock.class, diff --git a/src/main/java/org/violetmoon/zetaimplforge/module/ModFileScanDataModuleFinder.java b/src/main/java/org/violetmoon/zetaimplforge/module/ModFileScanDataModuleFinder.java index ddf6e4fb0a..aada067caf 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/module/ModFileScanDataModuleFinder.java +++ b/src/main/java/org/violetmoon/zetaimplforge/module/ModFileScanDataModuleFinder.java @@ -1,7 +1,5 @@ package org.violetmoon.zetaimplforge.module; -import java.util.stream.Stream; - import net.minecraftforge.fml.ModList; import net.minecraftforge.forgespi.language.ModFileScanData; import org.objectweb.asm.Type; @@ -10,6 +8,8 @@ import org.violetmoon.zeta.module.ZetaLoadModuleAnnotationData; import org.violetmoon.zeta.module.ZetaModule; +import java.util.stream.Stream; + public class ModFileScanDataModuleFinder implements ModuleFinder { private static final Type ZLM_TYPE = Type.getType(ZetaLoadModule.class); private final ModFileScanData mfsd; diff --git a/src/main/java/org/violetmoon/zetaimplforge/network/ForgeNetworkEventContextImpl.java b/src/main/java/org/violetmoon/zetaimplforge/network/ForgeNetworkEventContextImpl.java index d830d533bc..c519d309b4 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/network/ForgeNetworkEventContextImpl.java +++ b/src/main/java/org/violetmoon/zetaimplforge/network/ForgeNetworkEventContextImpl.java @@ -1,13 +1,13 @@ package org.violetmoon.zetaimplforge.network; -import java.util.concurrent.CompletableFuture; - import net.minecraft.network.Connection; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; import org.jetbrains.annotations.Nullable; import org.violetmoon.zeta.network.IZetaNetworkEventContext; +import java.util.concurrent.CompletableFuture; + public class ForgeNetworkEventContextImpl implements IZetaNetworkEventContext { private final NetworkEvent.Context ctx; diff --git a/src/main/java/org/violetmoon/zetaimplforge/network/ForgeZetaNetworkHandler.java b/src/main/java/org/violetmoon/zetaimplforge/network/ForgeZetaNetworkHandler.java index 1c148c20b5..4c7c07ee3a 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/network/ForgeZetaNetworkHandler.java +++ b/src/main/java/org/violetmoon/zetaimplforge/network/ForgeZetaNetworkHandler.java @@ -1,9 +1,5 @@ package org.violetmoon.zetaimplforge.network; -import java.util.function.BiConsumer; -import java.util.function.Function; -import java.util.function.Supplier; - import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; @@ -16,6 +12,10 @@ import org.violetmoon.zeta.network.ZetaNetworkDirection; import org.violetmoon.zeta.network.ZetaNetworkHandler; +import java.util.function.BiConsumer; +import java.util.function.Function; +import java.util.function.Supplier; + public class ForgeZetaNetworkHandler extends ZetaNetworkHandler { @VisibleForTesting //TODO ZETA: encapsulate, leaky abstraction in QuarkNetwork public final SimpleChannel channel; diff --git a/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeBrewingRegistry.java b/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeBrewingRegistry.java index 5a033d4b07..07287c7f12 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeBrewingRegistry.java +++ b/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeBrewingRegistry.java @@ -1,19 +1,18 @@ package org.violetmoon.zetaimplforge.registry; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Supplier; - +import net.minecraft.world.item.alchemy.Potion; +import net.minecraft.world.item.alchemy.PotionBrewing; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraftforge.registries.ForgeRegistries; import org.violetmoon.quark.mixin.accessor.AccessorPotionBrewing; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZCommonSetup; import org.violetmoon.zeta.registry.BrewingRegistry; import org.violetmoon.zetaimplforge.ForgeZeta; -import net.minecraft.world.item.alchemy.Potion; -import net.minecraft.world.item.alchemy.PotionBrewing; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraftforge.registries.ForgeRegistries; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; public class ForgeBrewingRegistry extends BrewingRegistry { public ForgeBrewingRegistry(ForgeZeta zeta) { diff --git a/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeCraftingExtensionsRegistry.java b/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeCraftingExtensionsRegistry.java index edba9faaed..987bbcef36 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeCraftingExtensionsRegistry.java +++ b/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeCraftingExtensionsRegistry.java @@ -1,13 +1,5 @@ package org.violetmoon.zetaimplforge.registry; -import java.util.HashMap; -import java.util.Map; - -import org.violetmoon.zeta.recipe.IZetaCondition; -import org.violetmoon.zeta.recipe.IZetaConditionSerializer; -import org.violetmoon.zeta.recipe.IZetaIngredientSerializer; -import org.violetmoon.zeta.registry.CraftingExtensionsRegistry; - import com.google.gson.JsonObject; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -16,6 +8,13 @@ import net.minecraftforge.common.crafting.IIngredientSerializer; import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.IConditionSerializer; +import org.violetmoon.zeta.recipe.IZetaCondition; +import org.violetmoon.zeta.recipe.IZetaConditionSerializer; +import org.violetmoon.zeta.recipe.IZetaIngredientSerializer; +import org.violetmoon.zeta.registry.CraftingExtensionsRegistry; + +import java.util.HashMap; +import java.util.Map; public class ForgeCraftingExtensionsRegistry implements CraftingExtensionsRegistry { public final Map, IIngredientSerializer> toForgeIngredientSerializers = new HashMap<>(); diff --git a/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeZetaRegistry.java b/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeZetaRegistry.java index 17ed4eec90..d6dbcf94b2 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeZetaRegistry.java +++ b/src/main/java/org/violetmoon/zetaimplforge/registry/ForgeZetaRegistry.java @@ -1,17 +1,16 @@ package org.violetmoon.zetaimplforge.registry; -import java.util.Collection; -import java.util.function.Supplier; - -import org.violetmoon.zeta.registry.ZetaRegistry; -import org.violetmoon.zetaimplforge.ForgeZeta; - import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.RegisterEvent; +import org.violetmoon.zeta.registry.ZetaRegistry; +import org.violetmoon.zetaimplforge.ForgeZeta; + +import java.util.Collection; +import java.util.function.Supplier; public class ForgeZetaRegistry extends ZetaRegistry { public ForgeZetaRegistry(ForgeZeta z) {