renamed things and moved stuff

src/main/java/net/raccoon/will/verdant_tides/VerdantTides.java

@@ -15,12 +15,10 @@
 import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;
 import net.neoforged.neoforge.event.server.ServerStartingEvent;
 import net.raccoon.will.verdant_tides.client.CuriosLayerDefinitions;
-import net.raccoon.will.verdant_tides.client.model.AquaBraceletModel;
-import net.raccoon.will.verdant_tides.client.renderer.AquaBraceletRenderer;
+import net.raccoon.will.verdant_tides.client.model.items.AquaBraceletModel;
+import net.raccoon.will.verdant_tides.client.renderers.items.AquaBraceletRenderer;
 import net.raccoon.will.verdant_tides.core.misc.VTCreativeTab;
-import net.raccoon.will.verdant_tides.registries.VTBlockRegistry;
-import net.raccoon.will.verdant_tides.registries.VTItemRegistry;
-import net.raccoon.will.verdant_tides.registries.VTSounds;
+import net.raccoon.will.verdant_tides.registries.*;
 import org.slf4j.Logger;
 import top.theillusivec4.curios.api.client.CuriosRendererRegistry;
 
@@ -32,20 +30,18 @@ public class VerdantTides {
 
     public VerdantTides(IEventBus modEventBus, ModContainer modContainer) {
         modEventBus.addListener(this::setup);
-
         NeoForge.EVENT_BUS.register(this);
 
+        VTItems.register(modEventBus);
         VTSounds.register(modEventBus);
+        VTBlocks.register(modEventBus);
+        VTParticles.register(modEventBus);
         VTCreativeTab.register(modEventBus);
-        VTItemRegistry.register(modEventBus);
-        VTBlockRegistry.register(modEventBus);
-
 
         modEventBus.addListener(this::addCreative);
     }
 
     public void setup(final FMLCommonSetupEvent event) {
-
     }
 
     private void addCreative(BuildCreativeModeTabContentsEvent event) {
@@ -60,7 +56,7 @@ public static class ClientModEvents {
 
         @SubscribeEvent
         public static void onClientSetup(FMLClientSetupEvent event) {
-            CuriosRendererRegistry.register((VTItemRegistry.AQUA_BRACELET.get()), AquaBraceletRenderer::new);
+            CuriosRendererRegistry.register((VTItems.AQUA_BRACELET.get()), AquaBraceletRenderer::new);
 
         }
 

src/main/java/net/raccoon/will/verdant_tides/client/model/AquaBraceletModel.java → src/main/java/net/raccoon/will/verdant_tides/client/model/items/AquaBraceletModel.java

@@ -1,4 +1,4 @@
-package net.raccoon.will.verdant_tides.client.model;
+package net.raccoon.will.verdant_tides.client.model.items;
 
 
 import com.google.common.collect.ImmutableList;

src/main/java/net/raccoon/will/verdant_tides/client/renderer/AquaBraceletRenderer.java → src/main/java/net/raccoon/will/verdant_tides/client/renderers/items/AquaBraceletRenderer.java

@@ -1,4 +1,4 @@
-package net.raccoon.will.verdant_tides.client.renderer;
+package net.raccoon.will.verdant_tides.client.renderers.items;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
@@ -16,7 +16,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.raccoon.will.verdant_tides.VerdantTides;
 import net.raccoon.will.verdant_tides.client.CuriosLayerDefinitions;
-import net.raccoon.will.verdant_tides.client.model.AquaBraceletModel;
+import net.raccoon.will.verdant_tides.client.model.items.AquaBraceletModel;
 import net.raccoon.will.verdant_tides.common.item.AquaBracelet;
 import top.theillusivec4.curios.api.SlotContext;
 import top.theillusivec4.curios.api.client.ICurioRenderer;

src/main/java/net/raccoon/will/verdant_tides/common/item/AquaBracelet.java

@@ -29,13 +29,15 @@ public void curioTick(SlotContext slotContext, ItemStack stack) {
         if (isNowInWater) {
             Vec3 movement = isSwimming ? player.getLookAngle().scale(0.03) : player.getKnownMovement().scale(0.15);
             player.addDeltaMovement(movement);
-        } else if (!isNowInWater && !hasDashed && !isCrouching) {
+        }
+        else if (!isNowInWater && !hasDashed && !isCrouching) {
             double dashStrength = 0.75;
             Vec3 lookDirection = player.getLookAngle();
             Vec3 dashVelocity = lookDirection.scale(dashStrength).multiply(1.1, 1.0, 1.1);
             player.addDeltaMovement(dashVelocity);
             data.putBoolean("HasDashed", true);
-        } if (isNowInWater && hasDashed) {
+        }
+        if (isNowInWater && hasDashed) {
             data.putBoolean("HasDashed", false);
         }
 

src/main/java/net/raccoon/will/verdant_tides/common/item/ItemLittleFriend.java → src/main/java/net/raccoon/will/verdant_tides/common/item/LittleFriend.java

@@ -6,8 +6,8 @@
 import net.minecraft.world.item.Tier;
 import net.minecraft.world.item.context.UseOnContext;
 
-public class ItemLittleFriend extends SwordItem {
-    public ItemLittleFriend(Tier tier, Properties properties) {
+public class LittleFriend extends SwordItem {
+    public LittleFriend(Tier tier, Properties properties) {
         super(tier, properties);
     }
 

src/main/java/net/raccoon/will/verdant_tides/core/data/VTBlockLootTableProv.java

@@ -14,7 +14,7 @@
 import net.minecraft.world.level.storage.loot.functions.ApplyBonusCount;
 import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction;
 import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;
-import net.raccoon.will.verdant_tides.registries.VTBlockRegistry;
+import net.raccoon.will.verdant_tides.registries.VTBlocks;
 
 import java.util.Set;
 
@@ -41,6 +41,6 @@ protected LootTable.Builder createMultipleOreDrops(Block pBlock, Item item, floa
     }
         @Override
     protected Iterable<Block> getKnownBlocks() {
-        return VTBlockRegistry.BLOCKS.getEntries().stream().map(Holder::value)::iterator;
+        return VTBlocks.BLOCKS.getEntries().stream().map(Holder::value)::iterator;
     }
 }

src/main/java/net/raccoon/will/verdant_tides/core/data/VTRecipeProv.java

@@ -8,7 +8,7 @@
 import net.minecraft.world.level.ItemLike;
 import net.neoforged.neoforge.common.conditions.IConditionBuilder;
 import net.raccoon.will.verdant_tides.VerdantTides;
-import net.raccoon.will.verdant_tides.registries.VTItemRegistry;
+import net.raccoon.will.verdant_tides.registries.VTItems;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -23,7 +23,7 @@ public VTRecipeProv(PackOutput pOutput, CompletableFuture<HolderLookup.Provider>
     protected void buildRecipes(@NotNull RecipeOutput recipeOutput) { //Recipes
 
 
-        ShapedRecipeBuilder.shaped(RecipeCategory.MISC, VTItemRegistry.AQUA_BRACELET.get())
+        ShapedRecipeBuilder.shaped(RecipeCategory.MISC, VTItems.AQUA_BRACELET.get())
                 .pattern("HHH")
                 .pattern("HTH")
                 .pattern("HHH")

src/main/java/net/raccoon/will/verdant_tides/core/events/UnderwaterBreakSpeedEvent.java

@@ -7,7 +7,7 @@
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.raccoon.will.verdant_tides.VerdantTides;
-import net.raccoon.will.verdant_tides.registries.VTItemRegistry;
+import net.raccoon.will.verdant_tides.registries.VTItems;
 import top.theillusivec4.curios.api.CuriosApi;
 import top.theillusivec4.curios.api.SlotResult;
 
@@ -20,7 +20,7 @@ public class UnderwaterBreakSpeedEvent {
     @SubscribeEvent
     public static void onBreakSpeed(PlayerEvent.BreakSpeed event) {
         Player player = event.getEntity();
-        Item itemToCheck = VTItemRegistry.AQUA_BRACELET.get();
+        Item itemToCheck = VTItems.AQUA_BRACELET.get();
 
         if (player.isUnderWater() && isWearingCurio(player, itemToCheck)) {
             float originalSpeed = event.getOriginalSpeed();
@@ -29,7 +29,7 @@ public static void onBreakSpeed(PlayerEvent.BreakSpeed event) {
     }
 
     private static void checkCurioItem(Player player, Item item) {
-        List<SlotResult> results = CuriosApi.getCuriosHelper().findCurios(player, VTItemRegistry.AQUA_BRACELET.get());
+        List<SlotResult> results = CuriosApi.getCuriosHelper().findCurios(player, VTItems.AQUA_BRACELET.get());
     }
 
     private static boolean isWearingCurio(Player player, Item item) {

src/main/java/net/raccoon/will/verdant_tides/core/misc/VTCreativeTab.java

@@ -7,7 +7,7 @@
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.registries.DeferredRegister;
 import net.raccoon.will.verdant_tides.VerdantTides;
-import net.raccoon.will.verdant_tides.registries.VTItemRegistry;
+import net.raccoon.will.verdant_tides.registries.VTItems;
 
 import java.util.function.Supplier;
 
@@ -17,11 +17,11 @@ public class VTCreativeTab {
 
     public static final Supplier<CreativeModeTab> VERDANT_TIDES_TAB = CREATIVE_MODE_TAB.register("verdanttides_tab",
             () -> CreativeModeTab.builder()
-                    .icon(() -> new ItemStack(VTItemRegistry.LITTLEFRIEND.get()))
+                    .icon(() -> new ItemStack(VTItems.LITTLEFRIEND.get()))
                     .title(Component.translatable("creativetab.verdanttides.verdanttides_tab"))
                     .displayItems((parameters, output) -> {
-                        output.accept(VTItemRegistry.AQUA_BRACELET);
-                        output.accept(VTItemRegistry.LITTLEFRIEND);
+                        output.accept(VTItems.AQUA_BRACELET);
+                        output.accept(VTItems.LITTLEFRIEND);
 
 
 

src/main/java/net/raccoon/will/verdant_tides/registries/VTBlockRegistry.java → src/main/java/net/raccoon/will/verdant_tides/registries/VTBlocks.java

@@ -11,37 +11,25 @@
 import java.util.function.Supplier;
 
 
-public class VTBlockRegistry {
+public class VTBlocks {
     public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(VerdantTides.MODID);
 
 
 
 
 
-
-
-    //SPACING
-
     private static <T extends Block> DeferredBlock<T> registerBlock(String name, Supplier<T> block, boolean registerItem) {
         DeferredBlock<T> toReturn = BLOCKS.register(name, block);
         if (registerItem) {
-            registerBlockItem(name, toReturn);
+            VTItems.ITEMS.register(name, () -> new BlockItem(toReturn.get(), new Item.Properties()));
         }
         return toReturn;
     }
-
     private static <T extends Block> DeferredBlock<T> registerBlock(String name, Supplier<T> block) {
-        DeferredBlock<T> toReturn = BLOCKS.register(name, block);
-        registerBlockItem(name, toReturn);
-        return toReturn;
-    }
-
-    private static <T extends Block> void registerBlockItem(String name, DeferredBlock<T> block) {
-        VTItemRegistry.ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties()));
+        return registerBlock(name, block, true);
     }
 
-    public static void register(IEventBus eventBus) {
-        BLOCKS.register(eventBus);
+    public static void register(IEventBus eventBus) {BLOCKS.register(eventBus);
     }
 }
 

src/main/java/net/raccoon/will/verdant_tides/registries/VTEntities.java

@@ -0,0 +1,20 @@
+package net.raccoon.will.verdant_tides.registries;
+
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.entity.EntityType;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.registries.DeferredRegister;
+import net.raccoon.will.verdant_tides.VerdantTides;
+
+
+public class VTEntities {
+    public static final DeferredRegister<EntityType<?>> ENTITY_TYPES = DeferredRegister.create(Registries.ENTITY_TYPE, VerdantTides.MODID);
+
+
+
+
+    public static void register(IEventBus eventBus) {ENTITY_TYPES.register(eventBus);
+    }
+}
+
+

src/main/java/net/raccoon/will/verdant_tides/registries/VTItemRegistry.java → src/main/java/net/raccoon/will/verdant_tides/registries/VTItems.java

@@ -8,22 +8,21 @@
 import net.neoforged.neoforge.registries.DeferredRegister;
 import net.raccoon.will.verdant_tides.VerdantTides;
 import net.raccoon.will.verdant_tides.common.item.AquaBracelet;
-import net.raccoon.will.verdant_tides.common.item.ItemLittleFriend;
+import net.raccoon.will.verdant_tides.common.item.LittleFriend;
 
 import static net.minecraft.world.item.Tiers.DIAMOND;
 
 
-public class VTItemRegistry {
+public class VTItems {
     public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(VerdantTides.MODID);
 
     public static final DeferredItem<SwordItem> LITTLEFRIEND = ITEMS.register("littlefriend",
-                () -> new ItemLittleFriend(DIAMOND, new Item.Properties().attributes(SwordItem.createAttributes(DIAMOND, 6, -3f)).stacksTo(1)));
+                () -> new LittleFriend(DIAMOND, new Item.Properties().attributes(SwordItem.createAttributes(DIAMOND, 6, -3f)).stacksTo(1)));
 
 
     public static final DeferredItem<Item> AQUA_BRACELET = ITEMS.register("aqua_bracelet", () -> new AquaBracelet(new Item.Properties()));
 
 
-    public static void register(IEventBus eventBus) {
-        ITEMS.register(eventBus);
+    public static void register(IEventBus eventBus) {ITEMS.register(eventBus);
     }
 }

src/main/java/net/raccoon/will/verdant_tides/registries/VTParticles.java

@@ -0,0 +1,22 @@
+package net.raccoon.will.verdant_tides.registries;
+
+import net.minecraft.core.particles.ParticleType;
+import net.minecraft.core.particles.SimpleParticleType;
+import net.minecraft.core.registries.Registries;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.registries.DeferredRegister;
+import net.raccoon.will.verdant_tides.VerdantTides;
+
+import java.util.function.Supplier;
+
+public class VTParticles {
+    public static final DeferredRegister<ParticleType<?>> PARTICLE_TYPES = DeferredRegister.create(Registries.PARTICLE_TYPE, VerdantTides.MODID);
+
+    public static final Supplier<SimpleParticleType> NOTE_PARTICLE = PARTICLE_TYPES.register("note_particle", () -> new SimpleParticleType(true));
+
+
+
+
+    public static void register(IEventBus eventBus) {PARTICLE_TYPES.register(eventBus);
+    }
+}

src/main/java/net/raccoon/will/verdant_tides/registries/VTSounds.java

@@ -20,7 +20,6 @@ private static DeferredHolder<SoundEvent, SoundEvent> registerSoundEvents(String
                 SoundEvent.createVariableRangeEvent(ResourceLocation.fromNamespaceAndPath(VerdantTides.MODID, name)));
     }
 
-    public static void register(IEventBus eventBus) {
-        SOUND_EVENTS.register(eventBus);
+    public static void register(IEventBus eventBus) {SOUND_EVENTS.register(eventBus);
     }
 }