diff --git a/dependencies.properties b/dependencies.properties index e2626a4167..e9f851aeaf 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -1,5 +1,5 @@ forge=47.1.3 -zeta=1.0-beta-1.19 +zeta=1.0-beta-1.20 jei=4712868 terrablender=1.20.1-3.0.0.169 flan=4819286 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 ec9934989e..13ea968cf4 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 @@ -13,11 +13,9 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; - import org.jetbrains.annotations.NotNull; - import org.violetmoon.quark.base.handler.MiscUtil; -import org.violetmoon.quark.base.util.SimpleInventoryBlockEntity; +import org.violetmoon.zeta.util.SimpleInventoryBlockEntity; import java.util.Random; 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 39c6cbf7f0..c1bab82ac2 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 @@ -35,7 +35,7 @@ import org.violetmoon.quark.addons.oddities.module.PipesModule; import org.violetmoon.quark.base.handler.MiscUtil; import org.violetmoon.quark.base.handler.QuarkSounds; -import org.violetmoon.quark.base.util.SimpleInventoryBlockEntity; +import org.violetmoon.zeta.util.SimpleInventoryBlockEntity; 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 62f437ee28..ab5838c363 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 @@ -25,7 +25,7 @@ import org.violetmoon.quark.addons.oddities.util.TinyPotatoInfo; import org.violetmoon.quark.base.handler.MiscUtil; import org.violetmoon.quark.base.handler.QuarkSounds; -import org.violetmoon.quark.base.util.SimpleInventoryBlockEntity; +import org.violetmoon.zeta.util.SimpleInventoryBlockEntity; import java.util.HashMap; import java.util.Map; 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 9046280f89..558a81216a 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/FuelHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/FuelHandler.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.block.SlabBlock; import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.util.BlockUtils; +import org.violetmoon.zeta.util.BlockUtils; import org.violetmoon.quark.content.building.block.VerticalSlabBlock; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; 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 eb7c968aa2..d58d9d804b 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/MiscUtil.java +++ b/src/main/java/org/violetmoon/quark/base/handler/MiscUtil.java @@ -56,7 +56,7 @@ import org.jetbrains.annotations.NotNull; import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.util.BlockUtils; +import org.violetmoon.zeta.util.BlockUtils; import org.violetmoon.quark.content.experimental.module.EnchantmentsBegoneModule; import org.violetmoon.zeta.client.config.screen.ZetaScreen; import org.violetmoon.zeta.client.event.play.ZScreen; diff --git a/src/main/java/org/violetmoon/quark/base/util/BlockUtils.java b/src/main/java/org/violetmoon/quark/base/util/BlockUtils.java deleted file mode 100644 index 3256acebbc..0000000000 --- a/src/main/java/org/violetmoon/quark/base/util/BlockUtils.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.violetmoon.quark.base.util; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; -import net.minecraft.world.level.material.MapColor; - -/** - * Assortment of Block Related Utilities - */ -@Deprecated(forRemoval = true) -public class BlockUtils { - public static boolean isWoodBased(BlockState state) { - NoteBlockInstrument noteBlockInstrument = state.instrument(); - SoundType soundType = state.getSoundType(); - - return noteBlockInstrument == NoteBlockInstrument.BASS || - soundType == SoundType.BAMBOO_WOOD || - soundType == SoundType.CHERRY_WOOD || - soundType == SoundType.NETHER_WOOD || - soundType == SoundType.WOOD; - } - - public static boolean isGlassBased(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos) { - return blockState.getBlock().propagatesSkylightDown(blockState, blockGetter, blockPos) || - blockState.getSoundType() == SoundType.GLASS; - } - - public static boolean isStoneBased(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos) { - return blockState.instrument() == NoteBlockInstrument.BASEDRUM || blockState.getMapColor(blockGetter, blockPos) == MapColor.STONE; - } - - public static boolean canFallThrough(BlockState state) { - Block block = state.getBlock(); - return state.isAir() || block == Blocks.FIRE || state.liquid() || state.canBeReplaced(); - } -} diff --git a/src/main/java/org/violetmoon/quark/base/util/QuarkEffect.java b/src/main/java/org/violetmoon/quark/base/util/QuarkEffect.java deleted file mode 100755 index bec4189ffb..0000000000 --- a/src/main/java/org/violetmoon/quark/base/util/QuarkEffect.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Quark Mod. Get the Source Code in github: - * https://github.com/Vazkii/Quark - * - * Quark is Open Source and distributed under the - * CC-BY-NC-SA 3.0 License: https://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB - * - * File Created @ [03/07/2016, 17:24:22 (GMT)] - */ -package org.violetmoon.quark.base.util; - -import net.minecraft.core.registries.Registries; -import net.minecraft.world.effect.MobEffect; -import net.minecraft.world.effect.MobEffectCategory; - -import org.violetmoon.quark.base.Quark; - -@Deprecated(forRemoval = true) -public class QuarkEffect extends MobEffect { - - public QuarkEffect(String name, MobEffectCategory type, int color) { - super(type, color); - - Quark.ZETA.registry.register(this, name, Registries.MOB_EFFECT); - } -} diff --git a/src/main/java/org/violetmoon/quark/base/util/SimpleInventoryBlockEntity.java b/src/main/java/org/violetmoon/quark/base/util/SimpleInventoryBlockEntity.java deleted file mode 100644 index f9a96c319c..0000000000 --- a/src/main/java/org/violetmoon/quark/base/util/SimpleInventoryBlockEntity.java +++ /dev/null @@ -1,204 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Psi Mod. Get the Source Code in github: - * https://github.com/Vazkii/Psi - * - * Psi is Open Source and distributed under the - * Psi License: http://psi.vazkii.us/license.php - * - * File Created @ [10/01/2016, 15:13:46 (GMT)] - */ -package org.violetmoon.quark.base.util; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.NonNullList; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.world.WorldlyContainer; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.wrapper.SidedInvWrapper; - -import org.jetbrains.annotations.NotNull; - -import org.violetmoon.zeta.block.be.ZetaBlockEntity; - -// formerly from AutoRegLib -@Deprecated(forRemoval = true) -public abstract class SimpleInventoryBlockEntity extends ZetaBlockEntity implements WorldlyContainer { - - public SimpleInventoryBlockEntity(BlockEntityType tileEntityTypeIn, BlockPos pos, BlockState state) { - super(tileEntityTypeIn, pos, state); - } - - protected NonNullList inventorySlots = NonNullList.withSize(getContainerSize(), ItemStack.EMPTY); - - @Override - public void readSharedNBT(CompoundTag par1NBTTagCompound) { - if(!needsToSyncInventory()) - return; - - ListTag var2 = par1NBTTagCompound.getList("Items", 10); - clearContent(); - for(int var3 = 0; var3 < var2.size(); ++var3) { - CompoundTag var4 = var2.getCompound(var3); - byte var5 = var4.getByte("Slot"); - if(var5 >= 0 && var5 < inventorySlots.size()) - inventorySlots.set(var5, ItemStack.of(var4)); - } - } - - @Override - public void writeSharedNBT(CompoundTag par1NBTTagCompound) { - if(!needsToSyncInventory()) - return; - - ListTag var2 = new ListTag(); - for(int var3 = 0; var3 < inventorySlots.size(); ++var3) { - if(!inventorySlots.get(var3).isEmpty()) { - CompoundTag var4 = new CompoundTag(); - var4.putByte("Slot", (byte) var3); - inventorySlots.get(var3).save(var4); - var2.add(var4); - } - } - par1NBTTagCompound.put("Items", var2); - } - - protected boolean needsToSyncInventory() { - return true; - } - - @NotNull - @Override - public ItemStack getItem(int i) { - return inventorySlots.get(i); - } - - @NotNull - @Override - public ItemStack removeItem(int i, int j) { - if(!inventorySlots.get(i).isEmpty()) { - ItemStack stackAt; - - if(inventorySlots.get(i).getCount() <= j) { - stackAt = inventorySlots.get(i); - inventorySlots.set(i, ItemStack.EMPTY); - inventoryChanged(i); - return stackAt; - } else { - stackAt = inventorySlots.get(i).split(j); - - if(inventorySlots.get(i).getCount() == 0) - inventorySlots.set(i, ItemStack.EMPTY); - inventoryChanged(i); - - return stackAt; - } - } - - return ItemStack.EMPTY; - } - - @NotNull - @Override - public ItemStack removeItemNoUpdate(int i) { - ItemStack stack = getItem(i); - setItem(i, ItemStack.EMPTY); - inventoryChanged(i); - return stack; - } - - @Override - public void setItem(int i, @NotNull ItemStack itemstack) { - inventorySlots.set(i, itemstack); - inventoryChanged(i); - } - - @Override - public int getMaxStackSize() { - return 64; - } - - @Override - public boolean isEmpty() { - for(int i = 0; i < getContainerSize(); i++) { - ItemStack stack = getItem(i); - if(!stack.isEmpty()) - return false; - } - - return true; - } - - @Override - public boolean stillValid(@NotNull Player entityplayer) { - return getLevel().getBlockEntity(getBlockPos()) == this && entityplayer.distanceToSqr(worldPosition.getX() + 0.5D, worldPosition.getY() + 0.5D, worldPosition.getZ() + 0.5D) <= 64; - } - - @SuppressWarnings("unchecked") - @Override - public LazyOptional getCapability(@NotNull Capability capability, Direction facing) { - if(capability == ForgeCapabilities.ITEM_HANDLER) - return (LazyOptional) LazyOptional.of(() -> new SidedInvWrapper(this, facing)); - - return LazyOptional.empty(); - } - - @Override - public boolean canPlaceItem(int i, @NotNull ItemStack itemstack) { - return true; - } - - @Override - public void startOpen(@NotNull Player player) { - // NO-OP - } - - @Override - public void stopOpen(@NotNull Player player) { - // NO-OP - } - - @Override - public void clearContent() { - inventorySlots = NonNullList.withSize(getContainerSize(), ItemStack.EMPTY); - } - - public void inventoryChanged(int i) { - // NO-OP - } - - public boolean isAutomationEnabled() { - return true; - } - - @Override - public boolean canTakeItemThroughFace(int index, @NotNull ItemStack stack, @NotNull Direction direction) { - return isAutomationEnabled(); - } - - @Override - public boolean canPlaceItemThroughFace(int index, @NotNull ItemStack itemStackIn, @NotNull Direction direction) { - return isAutomationEnabled(); - } - - @NotNull - @Override - public int[] getSlotsForFace(@NotNull Direction side) { - if(isAutomationEnabled()) { - int[] slots = new int[getContainerSize()]; - for(int i = 0; i < slots.length; i++) - slots[i] = i; - return slots; - } - - return new int[0]; - } -} diff --git a/src/main/java/org/violetmoon/quark/base/util/VanillaWoods.java b/src/main/java/org/violetmoon/quark/base/util/VanillaWoods.java deleted file mode 100644 index 09f0579fa6..0000000000 --- a/src/main/java/org/violetmoon/quark/base/util/VanillaWoods.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.violetmoon.quark.base.util; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.SoundType; - -@Deprecated(forRemoval = true) -public class VanillaWoods { - - public static record Wood(String name, Block log, Block wood, Block planks, Block leaf, Block fence, boolean nether, SoundType soundWood, SoundType soundPlanks) {} - - public static Wood OAK = new Wood("oak", Blocks.OAK_LOG, Blocks.OAK_WOOD, Blocks.OAK_PLANKS, Blocks.OAK_LEAVES, Blocks.OAK_FENCE, false, SoundType.WOOD, SoundType.WOOD); - public static Wood SPRUCE = new Wood("spruce", Blocks.SPRUCE_LOG, Blocks.SPRUCE_WOOD, Blocks.SPRUCE_PLANKS, Blocks.SPRUCE_LEAVES, Blocks.SPRUCE_FENCE, false, SoundType.WOOD, SoundType.WOOD); - public static Wood BIRCH = new Wood("birch", Blocks.BIRCH_LOG, Blocks.BIRCH_WOOD, Blocks.BIRCH_PLANKS, Blocks.BIRCH_LEAVES, Blocks.BIRCH_FENCE, false, SoundType.WOOD, SoundType.WOOD); - public static Wood JUNGLE = new Wood("jungle", Blocks.JUNGLE_LOG, Blocks.JUNGLE_WOOD, Blocks.JUNGLE_PLANKS, Blocks.JUNGLE_LEAVES, Blocks.JUNGLE_FENCE, false, SoundType.WOOD, SoundType.WOOD); - public static Wood ACACIA = new Wood("acacia", Blocks.ACACIA_LOG, Blocks.ACACIA_WOOD, Blocks.ACACIA_PLANKS, Blocks.ACACIA_LEAVES, Blocks.ACACIA_FENCE, false, SoundType.WOOD, SoundType.WOOD); - public static Wood DARK_OAK = new Wood("dark_oak", Blocks.DARK_OAK_LOG, Blocks.DARK_OAK_WOOD, Blocks.DARK_OAK_PLANKS, Blocks.DARK_OAK_LEAVES, Blocks.DARK_OAK_FENCE, false, SoundType.WOOD, SoundType.WOOD); - public static Wood MANGROVE = new Wood("mangrove", Blocks.MANGROVE_LOG, Blocks.MANGROVE_WOOD, Blocks.MANGROVE_PLANKS, Blocks.MANGROVE_LEAVES, Blocks.MANGROVE_FENCE, false, SoundType.WOOD, SoundType.WOOD); - public static Wood BAMBOO = new Wood("bamboo", Blocks.BAMBOO_BLOCK, null, Blocks.BAMBOO_PLANKS, null, Blocks.BAMBOO_FENCE, false, SoundType.BAMBOO_WOOD, SoundType.BAMBOO_WOOD); - public static Wood CHERRY = new Wood("cherry", Blocks.CHERRY_LOG, Blocks.CHERRY_WOOD, Blocks.CHERRY_PLANKS, Blocks.CHERRY_LEAVES, Blocks.CHERRY_FENCE, false, SoundType.CHERRY_WOOD, SoundType.CHERRY_WOOD); - - public static Wood CRIMSON = new Wood("crimson", Blocks.CRIMSON_STEM, Blocks.CRIMSON_HYPHAE, Blocks.CRIMSON_PLANKS, null, Blocks.CRIMSON_FENCE, true, SoundType.STEM, SoundType.NETHER_WOOD); - public static Wood WARPED = new Wood("warped", Blocks.WARPED_STEM, Blocks.WARPED_HYPHAE, Blocks.WARPED_PLANKS, null, Blocks.WARPED_FENCE, true, SoundType.STEM, SoundType.NETHER_WOOD); - - public static final Wood[] OVERWORLD_NON_OAK = new Wood[] { - SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK, MANGROVE, BAMBOO, CHERRY - }; - - public static final Wood[] OVERWORLD = new Wood[] { - OAK, SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK, MANGROVE, BAMBOO, CHERRY - }; - - public static final Wood[] OVERWORLD_WITH_TREE = new Wood[] { - OAK, SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK, MANGROVE, CHERRY - }; - - public static final Wood[] NETHER = new Wood[] { - CRIMSON, WARPED - }; - - public static final Wood[] ALL = new Wood[] { - OAK, SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK, CRIMSON, WARPED, MANGROVE, BAMBOO, CHERRY - }; - - public static final Wood[] ALL_WITH_LOGS = new Wood[] { - OAK, SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK, CRIMSON, WARPED, MANGROVE, CHERRY - }; - - public static final Wood[] NON_OAK = new Wood[] { - SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK, CRIMSON, WARPED, MANGROVE, BAMBOO, CHERRY - }; -} 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 0e66c6d866..05dc964030 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 @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.violetmoon.quark.base.util.BlockUtils; +import org.violetmoon.zeta.util.BlockUtils; import org.violetmoon.quark.content.automation.entity.Gravisand; import org.violetmoon.zeta.block.ZetaBlock; import org.violetmoon.zeta.module.ZetaModule; 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 7e52160c5a..9a4322df0b 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 @@ -7,8 +7,8 @@ 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; +import org.violetmoon.zeta.util.VanillaWoods; +import org.violetmoon.zeta.util.VanillaWoods.Wood; import org.violetmoon.quark.content.building.block.HedgeBlock; import org.violetmoon.quark.content.world.module.AncientWoodModule; import org.violetmoon.quark.content.world.module.BlossomTreesModule; 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 7817d8495c..45122ddf44 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 @@ -14,8 +14,8 @@ import org.violetmoon.quark.api.ICrawlSpaceBlock; import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.util.VanillaWoods; -import org.violetmoon.quark.base.util.VanillaWoods.Wood; +import org.violetmoon.zeta.util.VanillaWoods; +import org.violetmoon.zeta.util.VanillaWoods.Wood; import org.violetmoon.quark.content.building.block.HollowLogBlock; import org.violetmoon.zeta.advancement.ManualTrigger; import org.violetmoon.zeta.config.Config; 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 408a7fc5eb..0f259d08c1 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 @@ -5,8 +5,8 @@ import net.minecraft.world.level.block.ComposterBlock; import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.util.VanillaWoods; -import org.violetmoon.quark.base.util.VanillaWoods.Wood; +import org.violetmoon.zeta.util.VanillaWoods; +import org.violetmoon.zeta.util.VanillaWoods.Wood; import org.violetmoon.quark.content.building.block.LeafCarpetBlock; import org.violetmoon.quark.content.world.block.BlossomLeavesBlock; import org.violetmoon.quark.content.world.module.AncientWoodModule; 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 a4eee0a5de..e8fe9969a7 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 @@ -2,8 +2,8 @@ import net.minecraft.world.level.block.Blocks; -import org.violetmoon.quark.base.util.VanillaWoods; -import org.violetmoon.quark.base.util.VanillaWoods.Wood; +import org.violetmoon.zeta.util.VanillaWoods; +import org.violetmoon.zeta.util.VanillaWoods.Wood; import org.violetmoon.quark.content.building.block.VariantBookshelfBlock; import org.violetmoon.zeta.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; 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 ad068fc405..934a4b8aaf 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 @@ -31,8 +31,8 @@ import org.violetmoon.quark.base.QuarkClient; import org.violetmoon.quark.base.handler.StructureBlockReplacementHandler; import org.violetmoon.quark.base.handler.StructureBlockReplacementHandler.StructureHolder; -import org.violetmoon.quark.base.util.VanillaWoods; -import org.violetmoon.quark.base.util.VanillaWoods.Wood; +import org.violetmoon.zeta.util.VanillaWoods; +import org.violetmoon.zeta.util.VanillaWoods.Wood; import org.violetmoon.quark.content.building.block.*; import org.violetmoon.quark.content.building.block.be.VariantChestBlockEntity; import org.violetmoon.quark.content.building.block.be.VariantTrappedChestBlockEntity; 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 5e11aad6b3..8f336ad552 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 @@ -4,8 +4,8 @@ import net.minecraft.world.level.block.Blocks; import org.violetmoon.quark.base.handler.FuelHandler; -import org.violetmoon.quark.base.util.VanillaWoods; -import org.violetmoon.quark.base.util.VanillaWoods.Wood; +import org.violetmoon.zeta.util.VanillaWoods; +import org.violetmoon.zeta.util.VanillaWoods.Wood; import org.violetmoon.quark.content.building.block.VariantLadderBlock; import org.violetmoon.zeta.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; 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 d209b53642..b545550e33 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 @@ -3,8 +3,8 @@ import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.level.block.Block; -import org.violetmoon.quark.base.util.VanillaWoods; -import org.violetmoon.quark.base.util.VanillaWoods.Wood; +import org.violetmoon.zeta.util.VanillaWoods; +import org.violetmoon.zeta.util.VanillaWoods.Wood; import org.violetmoon.zeta.block.ZetaBlock; import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.load.ZRegister; 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 4be68c4580..9f1e4a2b29 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 @@ -13,8 +13,8 @@ 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.zeta.util.VanillaWoods; +import org.violetmoon.zeta.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; 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 0d36a16839..54bff14206 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 @@ -51,7 +51,7 @@ 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.BlockUtils; +import org.violetmoon.zeta.util.BlockUtils; import org.violetmoon.quark.base.util.IfFlagGoal; import org.violetmoon.quark.content.mobs.ai.ActWaryGoal; import org.violetmoon.quark.content.mobs.ai.FavorBlockGoal; 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 4911821714..b0b9a1d69b 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 @@ -48,7 +48,7 @@ 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.BlockUtils; +import org.violetmoon.zeta.util.BlockUtils; import org.violetmoon.quark.content.mobs.module.ToretoiseModule; import java.util.List; 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 9b66570ff3..f3fa3d088d 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,36 +1,6 @@ package org.violetmoon.quark.content.mobs.module; -import java.util.List; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.config.QuarkGeneralConfig; -import org.violetmoon.quark.base.handler.QuarkSounds; -import org.violetmoon.quark.base.util.QuarkEffect; -import org.violetmoon.quark.base.world.EntitySpawnHandler; -import org.violetmoon.quark.content.mobs.client.render.entity.CrabRenderer; -import org.violetmoon.quark.content.mobs.entity.Crab; -import org.violetmoon.zeta.advancement.modifier.BalancedDietModifier; -import org.violetmoon.zeta.advancement.modifier.FuriousCocktailModifier; -import org.violetmoon.zeta.advancement.modifier.TwoByTwoModifier; -import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.config.Config; -import org.violetmoon.zeta.config.type.CompoundBiomeConfig; -import org.violetmoon.zeta.config.type.EntitySpawnConfig; -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.ZEntityAttributeCreation; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.event.play.loading.ZVillagerTrades; -import org.violetmoon.zeta.item.ZetaItem; -import org.violetmoon.zeta.item.ZetaMobBucketItem; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.registry.CreativeTabManager; -import org.violetmoon.zeta.util.Hint; - import com.google.common.collect.ImmutableSet; - import net.minecraft.client.renderer.entity.EntityRenderers; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; @@ -55,6 +25,33 @@ 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.handler.QuarkSounds; +import org.violetmoon.quark.base.world.EntitySpawnHandler; +import org.violetmoon.quark.content.mobs.client.render.entity.CrabRenderer; +import org.violetmoon.quark.content.mobs.entity.Crab; +import org.violetmoon.zeta.advancement.modifier.BalancedDietModifier; +import org.violetmoon.zeta.advancement.modifier.FuriousCocktailModifier; +import org.violetmoon.zeta.advancement.modifier.TwoByTwoModifier; +import org.violetmoon.zeta.client.event.load.ZClientSetup; +import org.violetmoon.zeta.config.Config; +import org.violetmoon.zeta.config.type.CompoundBiomeConfig; +import org.violetmoon.zeta.config.type.EntitySpawnConfig; +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.ZEntityAttributeCreation; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.event.play.loading.ZVillagerTrades; +import org.violetmoon.zeta.item.ZetaItem; +import org.violetmoon.zeta.item.ZetaMobBucketItem; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.registry.CreativeTabManager; +import org.violetmoon.zeta.util.Hint; +import org.violetmoon.zeta.util.ZetaEffect; + +import java.util.List; /** * @author WireSegal @@ -115,7 +112,7 @@ public final void register(ZRegister event) { crab_bucket = new ZetaMobBucketItem(() -> crabType, () -> Fluids.WATER, () -> QuarkSounds.BUCKET_EMPTY_CRAB, "crab_bucket", this); - resilience = new QuarkEffect("resilience", MobEffectCategory.BENEFICIAL, 0x5b1a04); + resilience = new ZetaEffect(Quark.ZETA, "resilience", MobEffectCategory.BENEFICIAL, 0x5b1a04); resilience.addAttributeModifier(Attributes.KNOCKBACK_RESISTANCE, "2ddf3f0a-f386-47b6-aeb0-6bd32851f215", 0.5, AttributeModifier.Operation.ADDITION); event.getBrewingRegistry().addPotionMix("crab_brewing", () -> Ingredient.of(crab_shell), resilience); 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 ee61d7ad0f..f6ca257622 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 @@ -18,7 +18,7 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature; import net.minecraftforge.common.Tags; -import org.violetmoon.quark.base.util.BlockUtils; +import org.violetmoon.zeta.util.BlockUtils; import org.violetmoon.quark.base.world.generator.Generator; import org.violetmoon.quark.content.world.module.FairyRingsModule; import org.violetmoon.zeta.config.type.DimensionConfig; 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 11c58133ef..d31b356235 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 @@ -10,7 +10,7 @@ import net.minecraft.world.level.levelgen.FlatLevelSource; import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.util.BlockUtils; +import org.violetmoon.zeta.util.BlockUtils; import org.violetmoon.quark.base.world.generator.Generator; import org.violetmoon.quark.content.world.module.MonsterBoxModule; import org.violetmoon.zeta.config.type.DimensionConfig;