Skip to content

Commit

Permalink
remove energized flint and steel and soul fire
Browse files Browse the repository at this point in the history
  • Loading branch information
warior456 committed Sep 1, 2024
1 parent 8514ca2 commit e6c7382
Show file tree
Hide file tree
Showing 16 changed files with 1 addition and 315 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Download the mod and explore
- many new blocks and blocksets
- Many new items, including:
- 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

## Screenshots

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ 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_BLOCK, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BLUE_CRYSTAL_BLOCK, RenderLayer.getTranslucent());
Expand Down

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions src/main/java/net/ugi/sculk_depths/block/ModBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
//import net.kyrptonaught.customportalapi.CustomPortalBlock;
import net.minecraft.block.*;
import net.minecraft.block.enums.NoteBlockInstrument;
import net.minecraft.block.piston.PistonBehavior;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
Expand All @@ -13,7 +12,6 @@
import net.minecraft.registry.RegistryKey;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.util.DyeColor;
import net.minecraft.util.Identifier;
import net.ugi.sculk_depths.SculkDepths;
import net.ugi.sculk_depths.block.custom.*;
import net.ugi.sculk_depths.block.custom.ModCauldron.FlumrockCauldronBlock;
Expand All @@ -22,14 +20,11 @@
import net.ugi.sculk_depths.fluid.ModFluids;
import net.ugi.sculk_depths.item.ModItemGroup;
import net.ugi.sculk_depths.world.WorldGenerator;
import net.ugi.sculk_depths.block.custom.SoulFireBlock;
import net.ugi.sculk_depths.block.custom.ModCauldron.SporeFlumrockCauldronBlock;
import net.ugi.sculk_depths.block.dryable.*;
import net.ugi.sculk_depths.util.ModStrippableBlocks;
import net.ugi.sculk_depths.world.gen.feature.ModConfiguredFeatures;

import java.util.function.ToIntFunction;


public class ModBlocks {

Expand All @@ -42,8 +37,6 @@ public class ModBlocks {
public static final Block KRYSLUM_ENRICHED_SOIL = registerBlock("kryslum_enriched_soil",
new KryslumEnrichedSoilBLock(AbstractBlock.Settings.copy(Blocks.FARMLAND).ticksRandomly().strength(0.8f).sounds(BlockSoundGroup.MUDDY_MANGROVE_ROOTS)), ModItemGroup.SCULK_DEPTHS_BLOCKS);

public static final Block SOUL_FIRE = registerBlockWithoutBlockItem("soul_fire", new SoulFireBlock(AbstractBlock.Settings.copy(Blocks.SOUL_FIRE)), ModItemGroup.SCULK_DEPTHS_BLOCKS);

public static final Block AMALGAMITE = registerBlock("amalgamite",
new Block(AbstractBlock.Settings.copy(Blocks.DEEPSLATE).strength(3.0f, 6.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS_BLOCKS);

Expand Down
45 changes: 0 additions & 45 deletions src/main/java/net/ugi/sculk_depths/block/custom/SoulFireBlock.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ public void generate(RecipeExporter exporter) {
offerReversibleCompactingRecipes(exporter, RecipeCategory.MISC, ModItems.QUAZARITH_INGOT, RecipeCategory.BUILDING_BLOCKS, ModBlocks.QUAZARITH_BLOCK);

//tools
ShapelessRecipeJsonBuilder.create(RecipeCategory.TOOLS, ModItems.ENERGISED_FLINT_AND_STEEL)
.input(ModItems.ENERGY_ESSENCE)
.input(Items.FLINT_AND_STEEL)
.criterion(hasItem(ModItems.ENERGY_ESSENCE), conditionsFromItem(ModItems.ENERGY_ESSENCE))
//.group(group)
.offerTo(exporter, Identifier.of(getRecipeName(ModItems.ENERGISED_FLINT_AND_STEEL)));

//crux
/*
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/net/ugi/sculk_depths/item/ModItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey;
import net.minecraft.util.Identifier;
import net.ugi.sculk_depths.SculkDepths;
import net.ugi.sculk_depths.block.ModBlocks;
import net.ugi.sculk_depths.entity.ModEntities;
import net.ugi.sculk_depths.fluid.ModFluids;
import net.ugi.sculk_depths.item.custom.EnergizedFlintAndSteelItem;
import net.ugi.sculk_depths.item.custom.GlomperGlux;


Expand Down Expand Up @@ -46,8 +44,6 @@ public class ModItems {

public static final Item ENERGY_ESSENCE = registerItem("energy_essence",
new Item(new Item.Settings()));
public static final Item ENERGISED_FLINT_AND_STEEL = registerItem("energized_flint_and_steel",
new EnergizedFlintAndSteelItem(new Item.Settings().maxCount(1).maxDamage(128)));

public static final Item GLOMPER_GLUX = registerItem("glomper_glux",
new GlomperGlux(new Item.Settings()));
Expand All @@ -73,7 +69,7 @@ public class ModItems {

public static final Item QUAZARITH_AXE = registerItem("quazarith_axe",
new AxeItem(ModToolMaterials.QUAZARITH, //7, -3.0F,
new Item.Settings().attributeModifiers(AxeItem.createAttributeModifiers(ModToolMaterials.QUAZARITH, 7f,-3f)).fireproof()));
new Item.Settings().attributeModifiers(AxeItem.createAttributeModifiers(ModToolMaterials.QUAZARITH, 9f,-3f)).fireproof()));

public static final Item QUAZARITH_HOE = registerItem("quazarith_hoe",
new HoeItem(ModToolMaterials.QUAZARITH, //-4, 1.0F,
Expand Down Expand Up @@ -131,7 +127,6 @@ public static void addItemsToItemGroup() {

addToItemGroup(ModItemGroup.SCULK_DEPTHS_ITEMS, KRYSLUM_BUCKET);
addToItemGroup(ModItemGroup.SCULK_DEPTHS_ITEMS, ENERGY_ESSENCE);
addToItemGroup(ModItemGroup.SCULK_DEPTHS_ITEMS, ENERGISED_FLINT_AND_STEEL);

addToItemGroup(ModItemGroup.SCULK_DEPTHS_ITEMS, GLOMPER_GLUX);
addToItemGroup(ModItemGroup.SCULK_DEPTHS_ITEMS, GLOMPER_SPAWN_EGG);
Expand Down

This file was deleted.

90 changes: 0 additions & 90 deletions src/main/resources/assets/sculk_depths/blockstates/soul_fire.json

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/resources/assets/sculk_depths/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

"block.sculk_depths.crumbling_dirt" : "Crumbling Dirt",
"item.sculk_depths.chomper_colossus_spawn_egg": "Chomper Colossus Spawn Egg",
"item.sculk_depths.energized_flint_and_steel" : "Energized Flint and Steel",
"item.sculk_depths.energy_essence" : "Energy Essence",
"item.sculk_depths.glomper_glux" : "Glomper Glux",
"item.sculk_depths.glomper_spawn_egg": "Glomper Spawn Egg",
Expand Down Expand Up @@ -126,7 +125,6 @@
"block.sculk_depths.crux_block": "Crux Block",
"item.sculk_depths.crux": "Crux",

"block.sculk_depths.soul_fire": "Soul Fire",

"block.sculk_depths.zygrin_furnace": "Zygrin Furnace",

Expand Down
Loading

0 comments on commit e6c7382

Please sign in to comment.