folder renaming && textures

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.153'
+    id 'net.neoforged.gradle.userdev' version '7.0.165'
 }
 
 tasks.named('wrapper', Wrapper).configure {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/leclowndu93150/carbort/Carbort.java

@@ -1,6 +1,6 @@
 package com.leclowndu93150.carbort;
 
-import com.leclowndu93150.carbort.registry.*;
+import com.leclowndu93150.carbort.registries.*;
 import com.mojang.logging.LogUtils;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;

src/main/java/com/leclowndu93150/carbort/common/blockEntities/SmileyCloudBlockEntity.java → src/main/java/com/leclowndu93150/carbort/content/blockEntities/SmileyCloudBlockEntity.java

@@ -1,6 +1,6 @@
-package com.leclowndu93150.carbort.common.blockEntities;
+package com.leclowndu93150.carbort.content.blockEntities;
 
-import com.leclowndu93150.carbort.registry.BlockEntityRegistry;
+import com.leclowndu93150.carbort.registries.BlockEntityRegistry;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/com/leclowndu93150/carbort/common/blocks/BeanCropBlock.java → src/main/java/com/leclowndu93150/carbort/content/blocks/BeanCropBlock.java

@@ -1,6 +1,6 @@
-package com.leclowndu93150.carbort.common.blocks;
+package com.leclowndu93150.carbort.content.blocks;
 
-import com.leclowndu93150.carbort.registry.ItemRegistry;
+import com.leclowndu93150.carbort.registries.ItemRegistry;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.ItemLike;

src/main/java/com/leclowndu93150/carbort/common/blocks/CakeBlock.java → src/main/java/com/leclowndu93150/carbort/content/blocks/CakeBlock.java

@@ -1,8 +1,6 @@
-package com.leclowndu93150.carbort.common.blocks;
+package com.leclowndu93150.carbort.content.blocks;
 
-import com.leclowndu93150.carbort.Carbort;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;

src/main/java/com/leclowndu93150/carbort/common/blocks/PlaceableFoodBlock.java → src/main/java/com/leclowndu93150/carbort/content/blocks/PlaceableFoodBlock.java

@@ -1,4 +1,4 @@
-package com.leclowndu93150.carbort.common.blocks;
+package com.leclowndu93150.carbort.content.blocks;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;

src/main/java/com/leclowndu93150/carbort/common/effects/SlippyHands.java → src/main/java/com/leclowndu93150/carbort/content/effects/SlippyHands.java

@@ -1,6 +1,5 @@
-package com.leclowndu93150.carbort.common.effects;
+package com.leclowndu93150.carbort.content.effects;
 
-import com.leclowndu93150.carbort.Carbort;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectCategory;
 import net.minecraft.world.entity.LivingEntity;

src/main/java/com/leclowndu93150/carbort/common/effects/SoulTorment.java → src/main/java/com/leclowndu93150/carbort/content/effects/SoulTorment.java

@@ -1,12 +1,11 @@
-package com.leclowndu93150.carbort.common.effects;
+package com.leclowndu93150.carbort.content.effects;
 
-import com.leclowndu93150.carbort.registry.ItemRegistry;
+import com.leclowndu93150.carbort.registries.ItemRegistry;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectCategory;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 
 public class SoulTorment extends MobEffect {
     public SoulTorment(MobEffectCategory type, int col){

src/main/java/com/leclowndu93150/carbort/common/energy/IEnergyItem.java → src/main/java/com/leclowndu93150/carbort/content/energy/IEnergyItem.java

@@ -1,4 +1,4 @@
-package com.leclowndu93150.carbort.common.energy;
+package com.leclowndu93150.carbort.content.energy;
 
 public interface IEnergyItem {
     int getCapacity();

src/main/java/com/leclowndu93150/carbort/common/energy/ItemStackEnergyStorage.java → src/main/java/com/leclowndu93150/carbort/content/energy/ItemStackEnergyStorage.java

@@ -1,6 +1,6 @@
-package com.leclowndu93150.carbort.common.energy;
+package com.leclowndu93150.carbort.content.energy;
 
-import com.leclowndu93150.carbort.registry.DataComponentRegistry;
+import com.leclowndu93150.carbort.registries.DataComponentRegistry;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.IntTag;
 import net.minecraft.nbt.Tag;

src/main/java/com/leclowndu93150/carbort/common/items/BeanItem.java → src/main/java/com/leclowndu93150/carbort/content/items/BeanItem.java

@@ -1,10 +1,9 @@
-package com.leclowndu93150.carbort.common.items;
+package com.leclowndu93150.carbort.content.items;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemNameBlockItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Explosion;

src/main/java/com/leclowndu93150/carbort/common/items/ChunkAnalyzerItem.java → src/main/java/com/leclowndu93150/carbort/content/items/ChunkAnalyzerItem.java

@@ -1,23 +1,18 @@
-package com.leclowndu93150.carbort.common.items;
+package com.leclowndu93150.carbort.content.items;
 
 import com.leclowndu93150.carbort.CarbortConfig;
-import com.leclowndu93150.carbort.common.energy.IEnergyItem;
-import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerMenu;
-import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerScreen;
-import com.leclowndu93150.carbort.registry.DataComponentRegistry;
+import com.leclowndu93150.carbort.content.energy.IEnergyItem;
+import com.leclowndu93150.carbort.content.screen.ChunkAnalyzerMenu;
 import com.leclowndu93150.carbort.utils.CapabilityUtils;
-import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.SimpleContainerData;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Rarity;
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.energy.IEnergyStorage;
 import org.jetbrains.annotations.NotNull;

src/main/java/com/leclowndu93150/carbort/common/items/EmpItem.java → src/main/java/com/leclowndu93150/carbort/content/items/EmpItem.java

@@ -1,4 +1,4 @@
-package com.leclowndu93150.carbort.common.items;
+package com.leclowndu93150.carbort.content.items;
 
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.SplashPotionItem;

src/main/java/com/leclowndu93150/carbort/common/items/HealingAxeItem.java → src/main/java/com/leclowndu93150/carbort/content/items/HealingAxeItem.java

@@ -1,4 +1,4 @@
-package com.leclowndu93150.carbort.common.items;
+package com.leclowndu93150.carbort.content.items;
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;

src/main/java/com/leclowndu93150/carbort/common/items/PartyPickaxeItem.java → src/main/java/com/leclowndu93150/carbort/content/items/PartyPickaxeItem.java

@@ -1,22 +1,19 @@
-package com.leclowndu93150.carbort.common.items;
+package com.leclowndu93150.carbort.content.items;
 
 import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
 import net.minecraft.core.Direction;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.projectile.FireworkRocketEntity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.PickaxeItem;
-import net.minecraft.world.item.Tiers;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 
 public class PartyPickaxeItem extends PickaxeItem {

src/main/java/com/leclowndu93150/carbort/common/items/ToolTiers.java → src/main/java/com/leclowndu93150/carbort/content/items/ToolTiers.java

@@ -1,4 +1,4 @@
-package com.leclowndu93150.carbort.common.items;
+package com.leclowndu93150.carbort.content.items;
 
 import net.minecraft.world.item.Tier;
 import net.minecraft.world.item.crafting.Ingredient;

src/main/java/com/leclowndu93150/carbort/common/items/UnstableIngotItem.java → src/main/java/com/leclowndu93150/carbort/content/items/UnstableIngotItem.java

@@ -1,7 +1,7 @@
-package com.leclowndu93150.carbort.common.items;
+package com.leclowndu93150.carbort.content.items;
 
 import com.google.common.collect.Sets;
-import com.leclowndu93150.carbort.registry.DataComponentRegistry;
+import com.leclowndu93150.carbort.registries.DataComponentRegistry;
 import com.leclowndu93150.carbort.utils.RandomFunctions;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;

src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerDataPanel.java → src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerDataPanel.java

@@ -1,7 +1,6 @@
-package com.leclowndu93150.carbort.common.screen;
+package com.leclowndu93150.carbort.content.screen;
 
 import com.mojang.blaze3d.vertex.Tesselator;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;

src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerMenu.java → src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerMenu.java

@@ -1,8 +1,7 @@
-package com.leclowndu93150.carbort.common.screen;
+package com.leclowndu93150.carbort.content.screen;
 
-import com.leclowndu93150.carbort.common.items.ChunkAnalyzerItem;
-import com.leclowndu93150.carbort.registry.MenuRegistry;
-import com.leclowndu93150.carbort.utils.ChunkAnalyzerHelper;
+import com.leclowndu93150.carbort.content.items.ChunkAnalyzerItem;
+import com.leclowndu93150.carbort.registries.MenuRegistry;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;

src/main/java/com/leclowndu93150/carbort/common/screen/ChunkAnalyzerScreen.java → src/main/java/com/leclowndu93150/carbort/content/screen/ChunkAnalyzerScreen.java

@@ -1,4 +1,4 @@
-package com.leclowndu93150.carbort.common.screen;
+package com.leclowndu93150.carbort.content.screen;
 
 import com.leclowndu93150.carbort.Carbort;
 import com.leclowndu93150.carbort.networking.ChunkAnalyzerTogglePayload;

src/main/java/com/leclowndu93150/carbort/events/CarbortEvents.java

@@ -1,33 +1,26 @@
 package com.leclowndu93150.carbort.events;
 
 import com.leclowndu93150.carbort.Carbort;
-import com.leclowndu93150.carbort.common.energy.ItemStackEnergyStorage;
-import com.leclowndu93150.carbort.common.items.HealingAxeItem;
-import com.leclowndu93150.carbort.common.energy.IEnergyItem;
-import com.leclowndu93150.carbort.common.items.UnstableIngotItem;
-import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerScreen;
+import com.leclowndu93150.carbort.content.energy.ItemStackEnergyStorage;
+import com.leclowndu93150.carbort.content.items.HealingAxeItem;
+import com.leclowndu93150.carbort.content.energy.IEnergyItem;
+import com.leclowndu93150.carbort.content.screen.ChunkAnalyzerScreen;
 import com.leclowndu93150.carbort.networking.ChunkAnalyzerDataPayload;
 import com.leclowndu93150.carbort.networking.ChunkAnalyzerTogglePayload;
 import com.leclowndu93150.carbort.networking.PayloadActions;
-import com.leclowndu93150.carbort.registry.DataComponentRegistry;
-import com.leclowndu93150.carbort.registry.ItemRegistry;
-import com.leclowndu93150.carbort.registry.MenuRegistry;
-import net.minecraft.core.component.DataComponentType;
+import com.leclowndu93150.carbort.registries.MenuRegistry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.monster.Monster;
-import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
 import net.neoforged.neoforge.event.entity.player.AttackEntityEvent;
-import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 

src/main/java/com/leclowndu93150/carbort/networking/PayloadActions.java

@@ -1,24 +1,19 @@
 package com.leclowndu93150.carbort.networking;
 
-import com.leclowndu93150.carbort.Carbort;
 import com.leclowndu93150.carbort.CarbortConfig;
-import com.leclowndu93150.carbort.common.items.ChunkAnalyzerItem;
-import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerMenu;
-import com.leclowndu93150.carbort.common.screen.ChunkAnalyzerScreen;
-import com.leclowndu93150.carbort.registry.DataComponentRegistry;
+import com.leclowndu93150.carbort.content.items.ChunkAnalyzerItem;
+import com.leclowndu93150.carbort.content.screen.ChunkAnalyzerMenu;
+import com.leclowndu93150.carbort.content.screen.ChunkAnalyzerScreen;
 import com.leclowndu93150.carbort.utils.CapabilityUtils;
 import com.leclowndu93150.carbort.utils.ChunkAnalyzerHelper;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.TickTask;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
 import net.neoforged.neoforge.energy.IEnergyStorage;
 import net.neoforged.neoforge.network.PacketDistributor;

src/main/java/com/leclowndu93150/carbort/registry/BlockEntityRegistry.java → src/main/java/com/leclowndu93150/carbort/registries/BlockEntityRegistry.java

@@ -1,7 +1,7 @@
-package com.leclowndu93150.carbort.registry;
+package com.leclowndu93150.carbort.registries;
 
 import com.leclowndu93150.carbort.Carbort;
-import com.leclowndu93150.carbort.common.blockEntities.SmileyCloudBlockEntity;
+import com.leclowndu93150.carbort.content.blockEntities.SmileyCloudBlockEntity;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.neoforged.neoforge.registries.DeferredRegister;

src/main/java/com/leclowndu93150/carbort/registry/BlockRegistry.java → src/main/java/com/leclowndu93150/carbort/registries/BlockRegistry.java

@@ -1,7 +1,7 @@
-package com.leclowndu93150.carbort.registry;
+package com.leclowndu93150.carbort.registries;
 
 import com.leclowndu93150.carbort.Carbort;
-import com.leclowndu93150.carbort.common.blocks.BeanCropBlock;
+import com.leclowndu93150.carbort.content.blocks.BeanCropBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;

src/main/java/com/leclowndu93150/carbort/registry/CreativeTabRegistry.java → src/main/java/com/leclowndu93150/carbort/registries/CreativeTabRegistry.java

@@ -1,23 +1,19 @@
-package com.leclowndu93150.carbort.registry;
+package com.leclowndu93150.carbort.registries;
 
 import com.leclowndu93150.carbort.Carbort;
 import com.leclowndu93150.carbort.CarbortConfig;
-import com.leclowndu93150.carbort.common.items.ChunkAnalyzerItem;
 import com.leclowndu93150.carbort.utils.CapabilityUtils;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
 import net.neoforged.neoforge.energy.IEnergyStorage;
 import net.neoforged.neoforge.registries.DeferredHolder;
-import net.neoforged.neoforge.registries.DeferredItem;
 import net.neoforged.neoforge.registries.DeferredRegister;
 
-import static com.leclowndu93150.carbort.registry.BlockRegistry.BLOCKS;
-import static com.leclowndu93150.carbort.registry.ItemRegistry.*;
+import static com.leclowndu93150.carbort.registries.ItemRegistry.*;
 
 public class CreativeTabRegistry {
     public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Carbort.MODID);

src/main/java/com/leclowndu93150/carbort/registry/DataComponentRegistry.java → src/main/java/com/leclowndu93150/carbort/registries/DataComponentRegistry.java

@@ -1,12 +1,9 @@
-package com.leclowndu93150.carbort.registry;
+package com.leclowndu93150.carbort.registries;
 
 import com.leclowndu93150.carbort.Carbort;
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.network.codec.ByteBufCodecs;
-import net.neoforged.neoforge.energy.ComponentEnergyStorage;
 import net.neoforged.neoforge.registries.DeferredRegister;
 
 import java.util.function.Supplier;

src/main/java/com/leclowndu93150/carbort/registry/EffectRegistry.java → src/main/java/com/leclowndu93150/carbort/registries/EffectRegistry.java

@@ -1,16 +1,15 @@
-package com.leclowndu93150.carbort.registry;
+package com.leclowndu93150.carbort.registries;
 
 import com.leclowndu93150.carbort.Carbort;
-import com.leclowndu93150.carbort.common.effects.SlippyHands;
-import com.leclowndu93150.carbort.common.effects.SoulTorment;
+import com.leclowndu93150.carbort.content.effects.SlippyHands;
+import com.leclowndu93150.carbort.content.effects.SoulTorment;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectCategory;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.item.alchemy.Potion;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import net.neoforged.neoforge.registries.DeferredRegister;
-import net.neoforged.neoforge.registries.NeoForgeRegistries;
 
 public class EffectRegistry {
     public static final DeferredRegister<MobEffect> EFFECTS = DeferredRegister.create(Registries.MOB_EFFECT, Carbort.MODID);

src/main/java/com/leclowndu93150/carbort/registry/FoodRegistry.java → src/main/java/com/leclowndu93150/carbort/registries/FoodRegistry.java

@@ -1,6 +1,6 @@
-package com.leclowndu93150.carbort.registry;
+package com.leclowndu93150.carbort.registries;
 
-import com.leclowndu93150.carbort.registry.holder.CakeFlavour;
+import com.leclowndu93150.carbort.registries.holder.CakeFlavour;
 
 public class FoodRegistry {
     public FoodRegistry(){

src/main/java/com/leclowndu93150/carbort/registry/ItemRegistry.java → src/main/java/com/leclowndu93150/carbort/registries/ItemRegistry.java

@@ -1,7 +1,7 @@
-package com.leclowndu93150.carbort.registry;
+package com.leclowndu93150.carbort.registries;
 
 import com.leclowndu93150.carbort.Carbort;
-import com.leclowndu93150.carbort.common.items.*;
+import com.leclowndu93150.carbort.content.items.*;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.food.FoodProperties;
@@ -11,8 +11,6 @@
 import net.neoforged.neoforge.registries.DeferredItem;
 import net.neoforged.neoforge.registries.DeferredRegister;
 
-import java.util.Collections;
-
 public class ItemRegistry {
 
     public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(Carbort.MODID);

src/main/java/com/leclowndu93150/carbort/registries/KeyBindRegistry.java

@@ -0,0 +1,4 @@
+package com.leclowndu93150.carbort.registries;
+
+public class KeyBindRegistry {
+}