Merge branch 'main' into kotlin-rewrite

This commit is contained in:
nelle 2024-03-09 21:09:35 -07:00
commit 1f5222b22b
2 changed files with 6 additions and 18 deletions

View file

@ -1,10 +1,7 @@
package xyz.limepot.stellarworks;
import net.minecraft.world.gen.GenerationStep;
import org.quiltmc.loader.api.ModContainer;
import org.quiltmc.qsl.base.api.entrypoint.ModInitializer;
import org.quiltmc.qsl.worldgen.biome.api.BiomeModifications;
import org.quiltmc.qsl.worldgen.biome.api.BiomeSelectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import xyz.limepot.stellarworks.block.ModBlocks;
@ -13,9 +10,6 @@ import xyz.limepot.stellarworks.item.ModItemGroup;
import xyz.limepot.stellarworks.item.ModItems;
import xyz.limepot.stellarworks.world.ModFeatures;
import static xyz.limepot.stellarworks.world.ModFeatures.ALUMINIUM_ORE_PLACED_KEY;
import static xyz.limepot.stellarworks.world.ModFeatures.TIN_ORE_PLACED_KEY;
@SuppressWarnings("ALL")
public class Stellarworks implements ModInitializer {
@ -31,21 +25,15 @@ public class Stellarworks implements ModInitializer {
public void onInitialize(ModContainer mod) {
//ModConfiguredFeatures MUST ALWAYS be called first
ModFeatures.registerFeatures();
//ModConfiguredFeatures MUST ALWAYS be called first
//BIOME MODS - PLEASE LEAVE DIRECTLY AFTER FEATURE REGISTRY & IN THE MAIN CLASS (FOR NOW IDK HOW TO PUT IT IN IT'S OWN)
BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, ALUMINIUM_ORE_PLACED_KEY);
BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, TIN_ORE_PLACED_KEY);
///BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, ALUMINIUM_ORE_PLACED_KEY);
///BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, TIN_ORE_PLACED_KEY);
////Basic Registries
ModItems.registerModItems();
ModBlocks.registerModBlocks();
ModBlockEntities.registerBlockEntities();
ModItemGroup.registerItemGroups();
LOGGER.debug(MOD_ID + ": Registered!");
////Basic Registries
//
LOGGER.warn("Sine Termino has initialized, See you in the stars!");
}
}

View file

@ -21,14 +21,14 @@ import xyz.limepot.stellarworks.block.entity.ArcFurnaceBlockEntity;
public class ModBlocks {
//ores
public static final ExperienceDroppingBlock TIN_ORE = (ExperienceDroppingBlock) registerBlock("tin_ore", new Block(QuiltBlockSettings.copyOf(Blocks.STONE)
public static final Block TIN_ORE = registerBlock("tin_ore", new ExperienceDroppingBlock(QuiltBlockSettings.copyOf(Blocks.STONE)
.strength(4f).requiresTool()));
public static final ExperienceDroppingBlock ALUMINIUM_ORE = (ExperienceDroppingBlock) registerBlock("aluminium_ore", new Block(QuiltBlockSettings.copyOf(Blocks.STONE)
public static final Block ALUMINIUM_ORE = registerBlock("aluminium_ore", new ExperienceDroppingBlock(QuiltBlockSettings.copyOf(Blocks.STONE)
.strength(4f).requiresTool()));
//Deepslate Variety
public static final ExperienceDroppingBlock DEEPSLATE_ALUMINIUM_ORE = (ExperienceDroppingBlock) registerBlock("deepslate_aluminium_ore", new Block(QuiltBlockSettings.copyOf(Blocks.STONE)
public static final Block DEEPSLATE_ALUMINIUM_ORE = registerBlock("deepslate_aluminium_ore", new ExperienceDroppingBlock(QuiltBlockSettings.copyOf(Blocks.STONE)
.strength(4f).requiresTool()));
public static final ExperienceDroppingBlock DEEPSLATE_TIN_ORE = (ExperienceDroppingBlock) registerBlock("deepslate_tin_ore", new Block(QuiltBlockSettings.copyOf(Blocks.STONE)
public static final Block DEEPSLATE_TIN_ORE = registerBlock("deepslate_tin_ore", new ExperienceDroppingBlock(QuiltBlockSettings.copyOf(Blocks.STONE)
.strength(4f).requiresTool()));
//special blocks