Merge pull request #40 from warior456/main

0.0.8 1.20.1

.gitignore

@@ -38,3 +38,4 @@ hs_err_*.log
 replay_*.log
 *.hprof
 *.jfr
+/src/main/generated/.cache/

LICENSE.md

@@ -17,6 +17,8 @@
 7. Configuration files, which refers to
     1. Files ending in `.yml`, `.toml`, and `.mcmeta`
     2. Files named `fabric.mod.json` or `mods.toml` or `quilt.mod.json`
+8. Exceptions are:
+    1. Files ending in `.nbt`
 
 ### 1. Code
   Per the definitions above, Code is licensed under the “MIT” License, found below

README.md

@@ -2,11 +2,16 @@
 
 # Sculk Depths
 
+#### We are looking for developers and artists (non paid we don't make money yet)
+#### Interested? join our discord: https://discord.gg/dxANwW23Ub
+
 # Important Notes
 - This mods depends on Geckolib
 - The 1.20 release no longer supports worlds created with older versions. The file "biome3.json" has been removed, causing biome3 to revert to plains. This change does not affect the 1.19 releases, where this biome will continue to be supported (for now).
 
 # ABOUT
+[Wiki](https://github.com/warior456/Sculk-Depths/wiki)
+
 This mod adds a new dimension called "Sculk Depths" to Minecraft.
 
 To access this dimension, follow these steps:
@@ -23,12 +28,17 @@ When entering this dimension, it is recommended to bring a netherite pickaxe as
 
 - New dimension with custom world generation.
 - Four new biomes.
-- A new structure (work in progress).
+- 2 New Structures:
+  - A Laboratory
+  - An underground Lab
 - A new hostile mob: The Glomper. It attacks players using an elytra, so be careful while flying around!
 - Energy Essence drops when the warden kills a passive mob or when the warden is killed, this is used to craft an Energized Flint and Steel to open the portal.
 - Energized Flint and Steel: can light most blocks with Soul Fire and lights the portal
 - new blocks:
   - Cephlera Light
+  - Flumrock Cauldron
+  - Zygrin Light
+  - Zygrin Flow Block
 - Nine new block sets:
   - Umbrusk (stone type)
   - Umbrusk Bricks
@@ -49,7 +59,8 @@ When entering this dimension, it is recommended to bring a netherite pickaxe as
   ![image](https://user-images.githubusercontent.com/66562258/226136978-d1683dd1-d642-4cae-a204-0a92fb0ad2ba.png)
   ![image](https://user-images.githubusercontent.com/66562258/226213541-25528269-7c6c-46cd-8c4e-f0bab01fd724.png)
   ![image](https://user-images.githubusercontent.com/66562258/227038354-7217dba3-a006-4754-badc-6ff53b1db8f1.png)
-  ![image](https://user-images.githubusercontent.com/66562258/229311855-a1c336c4-e892-4e58-99d7-cd6cbe91376b.png)
+  ![image](https://github.com/warior456/Sculk-Depths/assets/66562258/5c4b29a9-0670-4d8c-be8e-60e0255e51b8)
+  ![image](https://github.com/warior456/Sculk-Depths/assets/66562258/90f1eb2c-3cb5-423f-913c-5021326b142a)
   ![image](https://github.com/warior456/Sculk-Depths/assets/66562258/cd48ee13-0355-4928-86b3-0ba684f9d54d)
 
 </details>

build.gradle

@@ -91,3 +91,33 @@ publishing {
 		// retrieving dependencies.
 	}
 }
+
+loom {
+	runs {
+		//
+		// This adds a new gradle task that runs the datagen API: "gradlew runDatagenClient"
+		//
+		datagenClient {
+			inherit client
+			name "Data Generation"
+			vmArg "-Dfabric-api.datagen"
+			vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
+			vmArg "-Dfabric-api.datagen.modid=${archives_base_name}"
+
+			runDir "build/datagen"
+		}
+	}
+}
+
+//
+// Adds the generated files into the jar you distribute to players.
+//
+sourceSets {
+	main {
+		resources {
+			srcDirs += [
+					'src/main/generated'
+			]
+		}
+	}
+}

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.parallel=true
 	loader_version=0.14.21
 
 # Mod Properties
-	mod_version = 0.0.7
+	mod_version = 0.0.8
 	maven_group = com.example
 	archives_base_name = sculk_depths
 

src/main/generated/data/sculk_depths/loot_tables/blocks/dried_valtrox_pressure_plate.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "sculk_depths:dried_valtrox_pressure_plate"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/sculk_depths/loot_tables/blocks/petrified_valtrox_pressure_plate.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "sculk_depths:petrified_valtrox_pressure_plate"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/sculk_depths/loot_tables/blocks/valtrox_pressure_plate.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "sculk_depths:valtrox_pressure_plate"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/java/net/ugi/sculk_depths/SculkDepths.java

@@ -2,23 +2,25 @@
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.sound.SoundEvent;
-import net.minecraft.util.Identifier;
+import net.ugi.sculk_depths.block.ModBlockEntities;
 import net.ugi.sculk_depths.block.ModBlocks;
+import net.ugi.sculk_depths.block.custom.ModCauldron.ModCauldronBehavior;
+import net.ugi.sculk_depths.config.Config;
+import net.ugi.sculk_depths.config.ConfigHandler;
 import net.ugi.sculk_depths.entity.ModEntities;
 import net.ugi.sculk_depths.entity.custom.GlomperEntity;
 import net.ugi.sculk_depths.item.ModItemGroup;
 import net.ugi.sculk_depths.item.ModItems;
 import net.ugi.sculk_depths.portal.Portals;
+import net.ugi.sculk_depths.recipe.ModRecipes;
 import net.ugi.sculk_depths.sound.ModSounds;
 import net.ugi.sculk_depths.util.ModLootTableModifiers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SculkDepths implements ModInitializer {
     public static final String MOD_ID = "sculk_depths";
+    public static ConfigHandler CONFIG;
     public static final Logger LOGGER = LoggerFactory.getLogger("sculk_depths");
 
 
@@ -27,14 +29,29 @@ public class SculkDepths implements ModInitializer {
 
     @Override
     public void onInitialize() {
+        SculkDepths.LOGGER.info("Loading Config for " + SculkDepths.MOD_ID);
+        Config.loadConfig();
+        SculkDepths.LOGGER.info("Registering Itemgroups for " + SculkDepths.MOD_ID);
         ModItemGroup.registerItemgroups();
+        SculkDepths.LOGGER.info("Registering items for " + SculkDepths.MOD_ID);
         ModItems.registerModItems();
+        SculkDepths.LOGGER.info("Registering Blocks for " + SculkDepths.MOD_ID);
         ModBlocks.registerModBlocks();
+        SculkDepths.LOGGER.info("Registering Portals for " + SculkDepths.MOD_ID);
         Portals.registerModPortals();
+        SculkDepths.LOGGER.info("Registering Sounds for " + SculkDepths.MOD_ID);
         ModSounds.registerModSounds();
+        SculkDepths.LOGGER.info("Registering LootTables for " + SculkDepths.MOD_ID);
         ModLootTableModifiers.modifyLootTables();
+        SculkDepths.LOGGER.info("Registering ModCauldronBehavior for " + SculkDepths.MOD_ID);
+        ModCauldronBehavior.registerBehavior();
+        //SculkDepths.LOGGER.info("Registering Recipes for " + SculkDepths.MOD_ID);
+        //ModRecipes.register();
+        //SculkDepths.LOGGER.info("Registering BlockEntities for " + SculkDepths.MOD_ID);
+        //ModBlockEntities.registerBlockEntities();
+        SculkDepths.LOGGER.info("Registering Entities for " + SculkDepths.MOD_ID);
         FabricDefaultAttributeRegistry.register(ModEntities.GLOMPER, GlomperEntity.setAttributes());
 
-        LOGGER.info("sculk_depths has loaded");
+        LOGGER.info(SculkDepths.MOD_ID + " has loaded");
     }
 }

src/main/java/net/ugi/sculk_depths/SculkDepthsClient.java

@@ -31,6 +31,7 @@ public void onInitializeClient() {
         BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.CEPHLERA, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.CEPHLERA_LIGHT, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.SOUL_FIRE, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.WHITE_CRYSTAL, RenderLayer.getTranslucent());
 
     }
 }

src/main/java/net/ugi/sculk_depths/SculkDepthsDataGenerator.java

@@ -2,17 +2,18 @@
 
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
-
-import net.ugi.sculk_depths.datagen.ModModelProvider;
+import net.ugi.sculk_depths.datagen.ModLootTableGenerator;
+import net.ugi.sculk_depths.datagen.ModModelGenerator;
 
 
 public class SculkDepthsDataGenerator implements DataGeneratorEntrypoint {
+
     @Override
     public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
         FabricDataGenerator.Pack pack = fabricDataGenerator.createPack();
 
-        //pack.addProvider(ModLootTableGenerator::new);
+        pack.addProvider(ModLootTableGenerator::new);
         //pack.addProvider(ModRecipeGenerator::new);
-        pack.addProvider(ModModelProvider::new);
+        pack.addProvider(ModModelGenerator::new);
     }
 }

src/main/java/net/ugi/sculk_depths/block/ModBlockEntities.java

@@ -0,0 +1,25 @@
+package net.ugi.sculk_depths.block;
+
+import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.util.Identifier;
+import net.ugi.sculk_depths.SculkDepths;
+import net.ugi.sculk_depths.block.entity.CauldronBlockEntity;
+
+import static net.ugi.sculk_depths.block.ModBlocks.FLUMROCK_CAULDRON;
+import static net.ugi.sculk_depths.block.ModBlocks.KRYSLUM_FLUMROCK_CAULDRON;
+
+public class ModBlockEntities {
+
+    public static BlockEntityType<CauldronBlockEntity> FLUMROCK_CAULDRON_BLOCK_ENTITY;
+
+    public static void registerBlockEntities() {
+                FLUMROCK_CAULDRON_BLOCK_ENTITY = Registry.register(
+                Registries.BLOCK_ENTITY_TYPE,
+                new Identifier(SculkDepths.MOD_ID, "flumrock_cauldron_block_entity"),
+                FabricBlockEntityTypeBuilder.create(CauldronBlockEntity::new, FLUMROCK_CAULDRON , KRYSLUM_FLUMROCK_CAULDRON).build());
+    }
+
+}