I refuse to do so...

MEGATREX4 · Aug 11, 2024 · 16648be · 16648be
1 parent 301ca88
commit 16648be
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 403 deletions.
diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java b/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java
@@ -2,7 +2,6 @@
 
 import com.megatrex4.ukrainian_dlight.block.DrinkBottleBlock;
 import com.megatrex4.ukrainian_dlight.block.FoodJarBlocks;
-import com.megatrex4.ukrainian_dlight.item.KrashankyItem;
 import com.megatrex4.ukrainian_dlight.registry.BlockRegistry;
 import com.megatrex4.ukrainian_dlight.block.entity.ModBlockEntities;
 //import com.megatrex4.ukrainian_dlight.compat.patchouli.CustomBrewingRecipeProcessor;
@@ -16,7 +15,9 @@
 import com.megatrex4.ukrainian_dlight.registry.ScreenHandlersRegistry;
 import com.megatrex4.ukrainian_dlight.registry.ScreensRegistry;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry;
 import net.minecraft.entity.damage.DamageType;
+import net.minecraft.item.ItemConvertible;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.text.MutableText;

diff --git a/...nian_dlight/block/custom/BottleBlock.java → ...4/ukrainian_dlight/block/BottleBlock.java b/...nian_dlight/block/custom/BottleBlock.java → ...4/ukrainian_dlight/block/BottleBlock.java
@@ -1,4 +1,4 @@
-package com.megatrex4.ukrainian_dlight.block.custom;
+package com.megatrex4.ukrainian_dlight.block;
 
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;

diff --git a/..._dlight/block/custom/BrewingKegBlock.java → ...rainian_dlight/block/BrewingKegBlock.java b/..._dlight/block/custom/BrewingKegBlock.java → ...rainian_dlight/block/BrewingKegBlock.java
@@ -1,10 +1,9 @@
-package com.megatrex4.ukrainian_dlight.block.custom;
+package com.megatrex4.ukrainian_dlight.block;
 
 import com.megatrex4.ukrainian_dlight.UkrainianDelight;
 import com.megatrex4.ukrainian_dlight.block.entity.BrewingKegBlockEntity;
 import com.megatrex4.ukrainian_dlight.block.entity.ModBlockEntities;
 import com.megatrex4.ukrainian_dlight.screen.renderer.FluidStackRenderer;
-import com.megatrex4.ukrainian_dlight.util.CompoundTagUtils;
 import com.megatrex4.ukrainian_dlight.util.FluidStack;
 
 import net.fabricmc.api.EnvType;
@@ -18,39 +17,30 @@
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.FluidState;
-import net.minecraft.fluid.Fluids;
-import net.minecraft.inventory.Inventories;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.particle.ParticleTypes;
-import net.minecraft.registry.Registries;
 import net.minecraft.screen.NamedScreenHandlerFactory;
-import net.minecraft.screen.ScreenHandler;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.DirectionProperty;
-import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.state.property.Property;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.*;
-import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.random.Random;
 import net.minecraft.util.shape.VoxelShape;
-import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Iterator;
 import java.util.List;
 
 public class BrewingKegBlock extends BlockWithEntity implements BlockEntityProvider {

diff --git a/...ght/block/custom/BrewingKegBlockItem.java → ...ian_dlight/block/BrewingKegBlockItem.java b/...ght/block/custom/BrewingKegBlockItem.java → ...ian_dlight/block/BrewingKegBlockItem.java
@@ -1,4 +1,4 @@
-package com.megatrex4.ukrainian_dlight.block.custom;
+package com.megatrex4.ukrainian_dlight.block;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.BlockItem;

diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/DrinkBottleBlock.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/DrinkBottleBlock.java
@@ -1,7 +1,6 @@
 package com.megatrex4.ukrainian_dlight.block;
 
 import com.megatrex4.ukrainian_dlight.UkrainianDelight;
-import com.megatrex4.ukrainian_dlight.block.custom.BottleBlock;
 import com.megatrex4.ukrainian_dlight.item.DrinkBlockItem;
 import net.minecraft.block.Block;
 import net.minecraft.entity.effect.StatusEffectInstance;

diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodJarBlocks.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodJarBlocks.java
@@ -1,7 +1,6 @@
 package com.megatrex4.ukrainian_dlight.block;
 
 import com.megatrex4.ukrainian_dlight.UkrainianDelight;
-import com.megatrex4.ukrainian_dlight.block.custom.JarBlock;
 import com.megatrex4.ukrainian_dlight.item.FoodBlockItem;
 import net.minecraft.block.Block;
 import net.minecraft.item.BlockItem;

diff --git a/...rainian_dlight/block/custom/JarBlock.java → ...rex4/ukrainian_dlight/block/JarBlock.java b/...rainian_dlight/block/custom/JarBlock.java → ...rex4/ukrainian_dlight/block/JarBlock.java
@@ -1,4 +1,4 @@
-package com.megatrex4.ukrainian_dlight.block.custom;
+package com.megatrex4.ukrainian_dlight.block;
 
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;

diff --git a/...ainian_dlight/block/custom/SaltBlock.java → ...ex4/ukrainian_dlight/block/SaltBlock.java b/...ainian_dlight/block/custom/SaltBlock.java → ...ex4/ukrainian_dlight/block/SaltBlock.java
@@ -1,4 +1,4 @@
-package com.megatrex4.ukrainian_dlight.block.custom;
+package com.megatrex4.ukrainian_dlight.block;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;

diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/custom/PysankerTableBlock.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/custom/PysankerTableBlock.java
diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/BrewingKegBlockEntity.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/BrewingKegBlockEntity.java
@@ -50,7 +50,7 @@
 
 import java.util.*;
 
-import static com.megatrex4.ukrainian_dlight.block.custom.BrewingKegBlock.FACING;
+import static com.megatrex4.ukrainian_dlight.block.BrewingKegBlock.FACING;
 
 public class BrewingKegBlockEntity extends BlockEntity implements ExtendedScreenHandlerFactory, ImplementedInventory {
     private final DefaultedList<ItemStack> inventory = DefaultedList.ofSize(INVENTORY_SIZE, ItemStack.EMPTY);

diff --git a/...4/ukrainian_dlight/features/Features.java → ...rainian_dlight/gen/features/Features.java b/...4/ukrainian_dlight/features/Features.java → ...rainian_dlight/gen/features/Features.java
@@ -1,8 +1,8 @@
-package com.megatrex4.ukrainian_dlight.features;
+package com.megatrex4.ukrainian_dlight.gen.features;
 
 import com.megatrex4.ukrainian_dlight.UkrainianDelight;
-import com.megatrex4.ukrainian_dlight.features.features.SaltCavesFeature;
-import com.megatrex4.ukrainian_dlight.features.features.config.SaltCavesFeatureConfig;
+import com.megatrex4.ukrainian_dlight.gen.features.features.SaltCavesFeature;
+import com.megatrex4.ukrainian_dlight.gen.features.features.config.SaltCavesFeatureConfig;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.world.gen.feature.Feature;

diff --git a/...t/features/features/SaltCavesFeature.java → ...n/features/features/SaltCavesFeature.java b/...t/features/features/SaltCavesFeature.java → ...n/features/features/SaltCavesFeature.java
@@ -1,7 +1,7 @@
-package com.megatrex4.ukrainian_dlight.features.features;
+package com.megatrex4.ukrainian_dlight.gen.features.features;
 
 
-import com.megatrex4.ukrainian_dlight.features.features.config.SaltCavesFeatureConfig;
+import com.megatrex4.ukrainian_dlight.gen.features.features.config.SaltCavesFeatureConfig;
 import com.mojang.serialization.Codec;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;

diff --git a/...atures/config/SaltCavesFeatureConfig.java → ...atures/config/SaltCavesFeatureConfig.java b/...atures/config/SaltCavesFeatureConfig.java → ...atures/config/SaltCavesFeatureConfig.java
@@ -1,4 +1,4 @@
-package com.megatrex4.ukrainian_dlight.features.features.config;
+package com.megatrex4.ukrainian_dlight.gen.features.features.config;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;

diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/KrashankyItem.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/KrashankyItem.java
@@ -1,6 +1,12 @@
 package com.megatrex4.ukrainian_dlight.item;
 
+import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
+import net.minecraft.world.World;
+
+import java.util.List;
 
 public class KrashankyItem extends Item {
     public KrashankyItem(Settings settings) {

diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java
@@ -33,7 +33,6 @@ public class ModItemGroups {
                     .icon(() -> new ItemStack(ItemsRegistry.CUCUMBER))
                     .entries((displayContext, entries) -> {
                         entries.add(BlockRegistry.BREWING_KEG);
-                        entries.add(BlockRegistry.PYSANKER_TABLE);
                         entries.add(BlockRegistry.SALT_BAG);
                         entries.add(BlockRegistry.SALT_BLOCK);
                         entries.add(ItemsRegistry.SALT);

diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/registry/BlockRegistry.java b/src/main/java/com/megatrex4/ukrainian_dlight/registry/BlockRegistry.java
@@ -1,10 +1,9 @@
 package com.megatrex4.ukrainian_dlight.registry;
 
 import com.megatrex4.ukrainian_dlight.UkrainianDelight;
-import com.megatrex4.ukrainian_dlight.block.custom.BrewingKegBlock;
-import com.megatrex4.ukrainian_dlight.block.custom.BrewingKegBlockItem;
-import com.megatrex4.ukrainian_dlight.block.custom.PysankerTableBlock;
-import com.megatrex4.ukrainian_dlight.block.custom.SaltBlock;
+import com.megatrex4.ukrainian_dlight.block.BrewingKegBlock;
+import com.megatrex4.ukrainian_dlight.block.BrewingKegBlockItem;
+import com.megatrex4.ukrainian_dlight.block.SaltBlock;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
@@ -29,8 +28,6 @@ public class BlockRegistry {
     public static final Block BREWING_KEG = registerBlock("brewing_keg",
             new BrewingKegBlock(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).sounds(BlockSoundGroup.WOOD).nonOpaque()));
 
-    public static final Block PYSANKER_TABLE = registerBlock("pysankers_table",
-            new PysankerTableBlock(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).sounds(BlockSoundGroup.WOOD)));
 
     private static Block registerBlock(String name, Block block){
         registerBlockItem(name, block);

diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/registry/ItemsRegistry.java b/src/main/java/com/megatrex4/ukrainian_dlight/registry/ItemsRegistry.java
@@ -1,5 +1,7 @@
 package com.megatrex4.ukrainian_dlight.registry;
 
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableList;
 import com.megatrex4.ukrainian_dlight.UkrainianDelight;
 import com.megatrex4.ukrainian_dlight.item.FoodItemBuilder;
 import com.megatrex4.ukrainian_dlight.item.ModFoodComponents;
@@ -10,6 +12,8 @@
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
 
+import java.util.List;
+
 public class ItemsRegistry {
 
     // Define items using the ItemBuilder
@@ -70,6 +74,7 @@ public class ItemsRegistry {
     public static final Item SALT = registerItem("salt", new FoodItemBuilder().build());
     public static final Item YEAST = registerItem("yeast", new FoodItemBuilder().build());
 
+    //KRASHANKY
     public static final Item BLACK_KRASHANKA = registerItem("black_krashanka", new KrashankyItem(new FabricItemSettings()));
     public static final Item BLUE_KRASHANKA = registerItem("blue_krashanka", new KrashankyItem(new FabricItemSettings()));
     public static final Item BROWN_KRASHANKA = registerItem("brown_krashanka", new KrashankyItem(new FabricItemSettings()));
@@ -87,6 +92,29 @@ public class ItemsRegistry {
     public static final Item WHITE_KRASHANKA = registerItem("white_krashanka", new KrashankyItem(new FabricItemSettings()));
     public static final Item YELLOW_KRASHANKA = registerItem("yellow_krashanka", new KrashankyItem(new FabricItemSettings()));
 
+//    public static final FluentIterable<Object> KRASHANKY_ITEMS = ;
+
+    //make to add all KRASHANY to KRASHANY_ITEMS to FluentIterable<Object>
+    public static final ImmutableList<Item> KRASHANKY_ITEMS = ImmutableList.of(
+            BLACK_KRASHANKA,
+            BLUE_KRASHANKA,
+            BROWN_KRASHANKA,
+            CYAN_KRASHANKA,
+            GREEN_KRASHANKA,
+            GRAY_KRASHANKA,
+            LIGHT_BLUE_KRASHANKA,
+            LIGHT_GRAY_KRASHANKA,
+            LIME_KRASHANKA,
+            MAGENTA_KRASHANKA,
+            ORANGE_KRASHANKA,
+            PINK_KRASHANKA,
+            PURPLE_KRASHANKA,
+            RED_KRASHANKA,
+            WHITE_KRASHANKA,
+            YELLOW_KRASHANKA
+    );
+
+
 
     // Register items
     public static Item registerItem(String name, Item item) {

diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/registry/PatternRegistry.java b/src/main/java/com/megatrex4/ukrainian_dlight/registry/PatternRegistry.java
diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/registry/ScreenHandlersRegistry.java b/src/main/java/com/megatrex4/ukrainian_dlight/registry/ScreenHandlersRegistry.java
@@ -2,7 +2,6 @@
 
 import com.megatrex4.ukrainian_dlight.UkrainianDelight;
 import com.megatrex4.ukrainian_dlight.screen.BrewingKegScreenHandler;
-import com.megatrex4.ukrainian_dlight.screen.PysankersTableScreenHandler;
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
 import net.minecraft.inventory.SimpleInventory;
 import net.minecraft.registry.Registries;
@@ -16,12 +15,6 @@ public class ScreenHandlersRegistry {
             Registry.register(Registries.SCREEN_HANDLER, new Identifier(UkrainianDelight.MOD_ID, "brewing_keg_screen_handler"),
                     new ExtendedScreenHandlerType<>(BrewingKegScreenHandler::new));
 
-
-    //register PYSANKERS_TABLE
-    public static final ScreenHandlerType<PysankersTableScreenHandler> PYSANKERS_TABLE_SCREEN_HANDLER =
-            Registry.register(Registries.SCREEN_HANDLER, new Identifier(UkrainianDelight.MOD_ID, "pysankers_table_screen_handler"),
-                    new ExtendedScreenHandlerType<>((syncId, inv, buf) -> new PysankersTableScreenHandler(syncId, inv, null, new SimpleInventory(PysankersTableScreenHandler.INVENTORY_SIZE), ScreenHandlerContext.EMPTY)));
-
     public static void registerModScreenHandlers() {
         UkrainianDelight.LOGGER.info("Registering Mod Screen Handlers for " + UkrainianDelight.MOD_ID);
         // If there are more screen handlers, register them here

diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/registry/ScreensRegistry.java b/src/main/java/com/megatrex4/ukrainian_dlight/registry/ScreensRegistry.java
@@ -1,12 +1,10 @@
 package com.megatrex4.ukrainian_dlight.registry;
 
 import com.megatrex4.ukrainian_dlight.screen.BrewingKegScreen;
-import com.megatrex4.ukrainian_dlight.screen.PysankersTableScreen;
 import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry;
 
 public class ScreensRegistry {
     public static void registerScreens() {
         ScreenRegistry.register(ScreenHandlersRegistry.BREWING_KEG_SCREEN_HANDLER, BrewingKegScreen::new);
-        ScreenRegistry.register(ScreenHandlersRegistry.PYSANKERS_TABLE_SCREEN_HANDLER, PysankersTableScreen::new);
     }
 }