Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding all items to tabs + Adding 1.20 items #4430

Merged
merged 3 commits into from
Dec 3, 2023
Merged

Adding all items to tabs + Adding 1.20 items #4430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bb68d9
Guys how do I fix my dev env
Siuolplex Dec 3, 2023
c1cdbd4
Guys its good I fixed my dev env
Siuolplex Dec 3, 2023
cab8858
Tabs are done (enough)
Siuolplex Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/org/violetmoon/quark/addons/oddities/item/BackpackItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.violetmoon.zeta.item.IZetaItem;
import org.violetmoon.zeta.item.ext.IZetaItemExtensions;
import org.violetmoon.zeta.module.ZetaModule;
import org.violetmoon.zeta.registry.CreativeTabManager;
import org.violetmoon.zeta.util.ItemNBTHelper;

import java.util.Map;
Expand All @@ -58,6 +59,8 @@ public BackpackItem(ZetaModule module) {

if(module.category.isAddon())
module.zeta.requiredModTooltipHandler.map(this, module.category.requiredMod);

CreativeTabManager.addToCreativeTab(CreativeModeTabs.TOOLS_AND_UTILITIES, this);
}

@Override
Expand Down
25 changes: 13 additions & 12 deletions src/main/java/org/violetmoon/quark/addons/oddities/item/TinyPotatoBlockItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
package org.violetmoon.quark.addons.oddities.item;

import java.util.List;

import org.jetbrains.annotations.NotNull;

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.item.ZetaBlockItem;
import org.violetmoon.zeta.util.ItemNBTHelper;

import net.minecraft.ChatFormatting;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
Expand All @@ -20,9 +8,21 @@
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.NotNull;
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.item.ZetaBlockItem;
import org.violetmoon.zeta.registry.CreativeTabManager;
import org.violetmoon.zeta.util.ItemNBTHelper;

import java.util.List;

public class TinyPotatoBlockItem extends ZetaBlockItem implements IRuneColorProvider {
private static final int NOT_MY_NAME = 17;
Expand All @@ -32,6 +32,7 @@ public class TinyPotatoBlockItem extends ZetaBlockItem implements IRuneColorProv

public TinyPotatoBlockItem(Block block, Properties properties) {
super(block, properties);
CreativeTabManager.addToCreativeTab(CreativeModeTabs.OP_BLOCKS, this);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/violetmoon/quark/addons/oddities/module/BackpackModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class BackpackModule extends ZetaModule {
@LoadEvent
public final void register(ZRegister event) {
backpack = new BackpackItem(this);
ravager_hide = new ZetaItem("ravager_hide", this, new Item.Properties().rarity(Rarity.RARE)).setCondition(() -> enableRavagerHide);
ravager_hide = new ZetaItem("ravager_hide", this, new Item.Properties().rarity(Rarity.RARE)).setCondition(() -> enableRavagerHide).setCreativeTab(CreativeModeTabs.INGREDIENTS);

menyType = IForgeMenuType.create(BackpackMenu::fromNetwork);
Quark.ZETA.registry.register(menyType, "backpack", Registries.MENU);
Expand Down
46 changes: 13 additions & 33 deletions src/main/java/org/violetmoon/quark/base/handler/WoodSetHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
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 com.google.common.collect.ImmutableSet;
import net.minecraft.client.renderer.Sheets;
import net.minecraft.client.renderer.entity.EntityRenderers;
Expand All @@ -18,20 +10,14 @@
import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.item.CreativeModeTabs;
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.properties.BlockSetType;
import net.minecraft.world.level.block.state.properties.WoodType;
import net.minecraft.world.level.material.MapColor;
import net.minecraftforge.common.ToolActions;
import org.violetmoon.quark.base.Quark;
import org.violetmoon.zeta.block.OldMaterials;
import org.violetmoon.zeta.block.ZetaTrapdoorBlock;
import org.violetmoon.quark.base.client.render.QuarkBoatRenderer;
import org.violetmoon.quark.base.item.boat.QuarkBoat;
import org.violetmoon.quark.base.item.boat.QuarkBoatDispenseItemBehavior;
Expand All @@ -41,29 +27,19 @@
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.block.IZetaBlock;
import org.violetmoon.zeta.block.ZetaBlock;
import org.violetmoon.zeta.block.ZetaDoorBlock;
import org.violetmoon.zeta.block.ZetaFenceBlock;
import org.violetmoon.zeta.block.ZetaFenceGateBlock;
import org.violetmoon.zeta.block.ZetaPillarBlock;
import org.violetmoon.zeta.block.ZetaPressurePlateBlock;
import org.violetmoon.zeta.block.ZetaStandingSignBlock;
import org.violetmoon.zeta.block.ZetaWallSignBlock;
import org.violetmoon.zeta.block.ZetaWoodenButtonBlock;
import org.violetmoon.quark.content.building.module.*;
import org.violetmoon.zeta.block.*;
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.item.ZetaHangingSignItem;
import org.violetmoon.zeta.item.ZetaSignItem;
import org.violetmoon.zeta.module.ZetaModule;

import java.util.*;
import java.util.stream.Stream;

public class WoodSetHandler {

public record QuarkBoatType(String name, Item boat, Item chestBoat, Block planks) {}
Expand Down Expand Up @@ -137,6 +113,9 @@ public static WoodSet addWoodSet(ZRegister event, ZetaModule module, String name
set.sign = new ZetaStandingSignBlock(name + "_sign", module, type, OldMaterials.wood().mapColor(color).noCollission().strength(1.0F).sound(SoundType.WOOD));
set.wallSign = new ZetaWallSignBlock(name + "_wall_sign", module, type, OldMaterials.wood().mapColor(color).noCollission().strength(1.0F).sound(SoundType.WOOD).lootFrom(() -> set.sign));

set.ceilingHangingSign = new ZetaCeilingHangingSignBlock(name + "_hanging_sign", module, type, OldMaterials.wood().mapColor(color).noCollission().strength(1.0F).sound(SoundType.WOOD));
set.wallHangingSign = new ZetaWallHangingSignBlock(name + "_wall_hanging_sign", module, type, OldMaterials.wood().mapColor(color).noCollission().strength(1.0F).sound(SoundType.WOOD).lootFrom(() -> set.sign));

set.bookshelf = new VariantBookshelfBlock(name, module, true).setCondition(() -> Quark.ZETA.modules.isEnabledOrOverlapping(VariantBookshelvesModule.class));
set.ladder = new VariantLadderBlock(name, module, true).setCondition(() -> Quark.ZETA.modules.isEnabledOrOverlapping(VariantLaddersModule.class));

Expand All @@ -151,6 +130,7 @@ public static WoodSet addWoodSet(ZRegister event, ZetaModule module, String name
VariantChestsModule.makeChestBlocksExternal(module, name, Blocks.CHEST, () -> true);

set.signItem = new ZetaSignItem(module, set.sign, set.wallSign);
set.signItem = new ZetaHangingSignItem(module, set.ceilingHangingSign, set.wallHangingSign);

if(hasBoat) {
set.boatItem = new QuarkBoatItem(name, module, false);
Expand Down Expand Up @@ -216,8 +196,8 @@ public static class WoodSet {
public Block log, wood, planks, strippedLog, strippedWood,
slab, stairs, fence, fenceGate,
door, trapdoor, button, pressurePlate, sign, wallSign,
bookshelf, ladder, post, strippedPost, verticalPlanks,
hollowLog;
ceilingHangingSign, wallHangingSign, bookshelf, ladder, post,
strippedPost, verticalPlanks, hollowLog;

public Item signItem, boatItem, chestBoatItem;

Expand Down
20 changes: 6 additions & 14 deletions src/main/java/org/violetmoon/quark/base/item/QuarkMusicDiscItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
package org.violetmoon.quark.base.item;

import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.resources.sounds.SimpleSoundInstance;
import net.minecraft.client.resources.sounds.SoundInstance;
import net.minecraft.client.sounds.SoundManager;
import net.minecraft.core.BlockPos;
import net.minecraft.core.NonNullList;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.item.*;

import org.jetbrains.annotations.NotNull;

import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.RecordItem;
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 org.violetmoon.zeta.registry.CreativeTabManager;

import java.util.function.BooleanSupplier;
import java.util.function.Supplier;
Expand All @@ -38,6 +29,7 @@ public QuarkMusicDiscItem(int comparatorValue, Supplier<SoundEvent> sound, Strin
this.module = module;
this.isAmbient = lengthInTicks == Integer.MAX_VALUE;
this.soundSupplier = sound;
CreativeTabManager.addToCreativeTab(CreativeModeTabs.TOOLS_AND_UTILITIES, this);
}

@Override
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/org/violetmoon/quark/base/item/boat/QuarkBoatItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package org.violetmoon.quark.base.item.boat;

import java.util.List;
import java.util.function.Predicate;

import org.jetbrains.annotations.NotNull;

import net.minecraft.core.BlockPos;
import net.minecraft.stats.Stats;
import net.minecraft.world.InteractionHand;
Expand All @@ -13,6 +8,7 @@
import net.minecraft.world.entity.EntitySelector;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.vehicle.Boat;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.ClipContext;
Expand All @@ -21,9 +17,14 @@
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
import org.violetmoon.quark.base.handler.WoodSetHandler;
import org.violetmoon.zeta.item.ZetaItem;
import org.violetmoon.zeta.module.ZetaModule;
import org.violetmoon.zeta.registry.CreativeTabManager;

import java.util.List;
import java.util.function.Predicate;

public class QuarkBoatItem extends ZetaItem {

Expand All @@ -38,6 +39,7 @@ public QuarkBoatItem(String type, ZetaModule module, boolean chest) {

this.type = type;
this.chest = chest;
CreativeTabManager.addToCreativeTab(CreativeModeTabs.TOOLS_AND_UTILITIES, this);
}

// Vanilla copy
Expand Down
19 changes: 15 additions & 4 deletions src/main/java/org/violetmoon/quark/base/util/VanillaWoods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,38 @@ public static record Wood(String name, Block log, Block wood, Block planks, Bloc
public static Wood ACACIA = new Wood("acacia", Blocks.ACACIA_LOG, Blocks.ACACIA_WOOD, Blocks.ACACIA_PLANKS, Blocks.ACACIA_LEAVES, Blocks.ACACIA_FENCE, false);
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);
public static Wood MANGROVE = new Wood("mangrove", Blocks.MANGROVE_LOG, Blocks.MANGROVE_WOOD, Blocks.MANGROVE_PLANKS, Blocks.MANGROVE_LEAVES, Blocks.MANGROVE_FENCE, false);
public static Wood BAMBOO = new Wood("bamboo", Blocks.BAMBOO_BLOCK, null, Blocks.BAMBOO_PLANKS, null, Blocks.BAMBOO_FENCE, false);
public static Wood CHERRY = new Wood("cherry", Blocks.CHERRY_LOG, Blocks.CHERRY_WOOD, Blocks.CHERRY_PLANKS, Blocks.CHERRY_LEAVES, Blocks.CHERRY_FENCE, false);

public static Wood CRIMSON = new Wood("crimson", Blocks.CRIMSON_STEM, Blocks.CRIMSON_HYPHAE, Blocks.CRIMSON_PLANKS, null, Blocks.CRIMSON_FENCE, true);
public static Wood WARPED = new Wood("warped", Blocks.WARPED_STEM, Blocks.WARPED_HYPHAE, Blocks.WARPED_PLANKS, null, Blocks.WARPED_FENCE, true);


public static final Wood[] OVERWORLD_NON_OAK = new Wood[] {
SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK, MANGROVE
SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK, MANGROVE, BAMBOO, CHERRY
};

public static final Wood[] OVERWORLD = new Wood[] {
OAK, SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK, MANGROVE
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
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
SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK, CRIMSON, WARPED, MANGROVE, BAMBOO, CHERRY
};
}
2 changes: 1 addition & 1 deletion src/main/java/org/violetmoon/quark/content/automation/block/FeedingTroughBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
public SoundType getSoundTypeZeta(BlockState state, LevelReader world, BlockPos pos, @Nullable Entity entity) {
if (state.getValue(FULL))
return WOOD_WITH_PLANT_STEP;
return super.getSoundType(state, world, pos, entity);
return super.getSoundTypeZeta(state, world, pos, entity);
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/violetmoon/quark/content/building/item/QuarkItemFrameItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.violetmoon.quark.content.building.item;

import net.minecraft.world.item.CreativeModeTabs;
import org.jetbrains.annotations.NotNull;

import net.minecraft.core.BlockPos;
Expand All @@ -17,6 +18,7 @@
import org.violetmoon.quark.base.util.TriFunction;
import org.violetmoon.zeta.item.ZetaItem;
import org.violetmoon.zeta.module.ZetaModule;
import org.violetmoon.zeta.registry.CreativeTabManager;

/**
* @author WireSegal
Expand All @@ -28,6 +30,7 @@ public class QuarkItemFrameItem extends ZetaItem {
public QuarkItemFrameItem(String name, ZetaModule module, TriFunction<? extends HangingEntity, Level, BlockPos, Direction> entityProvider) {
super(name, module, new Item.Properties());
this.entityProvider = entityProvider;
CreativeTabManager.addToCreativeTab(CreativeModeTabs.FUNCTIONAL_BLOCKS, this);
}

@NotNull
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/violetmoon/quark/content/building/module/HedgesModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class HedgesModule extends ZetaModule {

@LoadEvent
public final void register(ZRegister event) {
for(Wood wood : VanillaWoods.OVERWORLD)
for(Wood wood : VanillaWoods.OVERWORLD_WITH_TREE)
new HedgeBlock(this, wood.fence(), wood.leaf());

new HedgeBlock(this, Blocks.OAK_FENCE, Blocks.AZALEA_LEAVES);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/violetmoon/quark/content/building/module/HollowLogsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class HollowLogsModule extends ZetaModule {

@LoadEvent
public final void register(ZRegister event) {
for(Wood wood : VanillaWoods.ALL) {
for(Wood wood : VanillaWoods.ALL_WITH_LOGS) {
new HollowLogBlock(wood.log(), this, !wood.nether());
// new HollowWoodBlock(wood.wood(), this, !wood.nether());
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/violetmoon/quark/content/building/module/LeafCarpetModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
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;
Expand All @@ -22,14 +19,17 @@
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", "immersive_weathering" })
public class LeafCarpetModule extends ZetaModule {

public static List<LeafCarpetBlock> carpets = new LinkedList<>();

@LoadEvent
public final void register(ZRegister event) {
for(Wood wood : VanillaWoods.OVERWORLD)
for(Wood wood : VanillaWoods.OVERWORLD_WITH_TREE)
carpet(wood.leaf());

carpet(Blocks.AZALEA_LEAVES);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/violetmoon/quark/content/building/module/MidoriModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class MidoriModule extends ZetaModule {

@LoadEvent
public final void register(ZRegister event) {
moss_paste = new ZetaItem("moss_paste", this, new Item.Properties());
moss_paste = new ZetaItem("moss_paste", this, new Item.Properties()).setCreativeTab(CreativeModeTabs.INGREDIENTS);

Block.Properties props = Block.Properties.of()
.mapColor(MapColor.COLOR_LIGHT_GREEN)
Expand Down
Loading
Loading