Skip to content

Commit 4de60f2

Browse files
JiingyJiingy
committed
Cleaned up code
Added "Item Settings" and "BlockSettings"
1 parent 5284cf5 commit 4de60f2

File tree

8 files changed

+153
-149
lines changed

8 files changed

+153
-149
lines changed

‎src/main/java/com/jingy/jineric/Jineric.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jingy.jineric;
22

3-
import com.jingy.jineric.registry.ModBlocks;
4-
import com.jingy.jineric.registry.ModItems;
3+
import com.jingy.jineric.registry.Blocks;
4+
import com.jingy.jineric.registry.Items;
55
import net.fabricmc.api.ModInitializer;
66

77
public class Jineric implements ModInitializer {
@@ -10,7 +10,7 @@ public class Jineric implements ModInitializer {
1010

1111
@Override
1212
public void onInitialize() {
13-
ModItems.registerItems();
14-
ModBlocks.registerBlocks();
13+
Items.registerItems();
14+
Blocks.registerBlocks();
1515
}
1616
}

‎src/main/java/com/jingy/jineric/registry/BlockSettings.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.jingy.jineric.registry;
2+
3+
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
4+
import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
5+
import net.minecraft.block.Block;
6+
import net.minecraft.block.Material;
7+
import net.minecraft.sound.BlockSoundGroup;
8+
9+
public class BlockSettings {
10+
11+
public static Block StoneSettings() {
12+
return new Block(FabricBlockSettings
13+
.of(Material.STONE)
14+
.breakByTool(FabricToolTags.PICKAXES, 0)
15+
.requiresTool()
16+
.strength(1.5f, 30.0f)
17+
.sounds(BlockSoundGroup.STONE));
18+
}
19+
20+
public static Block SandstoneSettings() {
21+
return new Block(FabricBlockSettings
22+
.of(Material.STONE)
23+
.breakByTool(FabricToolTags.PICKAXES, 0)
24+
.requiresTool()
25+
.strength(0.8f, 4f)
26+
.sounds(BlockSoundGroup.SOUL_SAND));
27+
}
28+
29+
}

‎src/main/java/com/jingy/jineric/registry/Blocks.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.jingy.jineric.registry;
2+
3+
import com.jingy.jineric.Jineric;
4+
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
5+
import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
6+
import net.minecraft.block.Block;
7+
import net.minecraft.block.Material;
8+
import net.minecraft.sound.BlockSoundGroup;
9+
import net.minecraft.util.Identifier;
10+
import net.minecraft.util.registry.Registry;
11+
12+
public class Blocks {
13+
14+
//STONE BLOCKS:
15+
public static final Block CORRITE = BlockSettings.StoneSettings();
16+
public static final Block BORITE = BlockSettings.StoneSettings();
17+
18+
//SAND BLOCKS:
19+
public static final Block WAVY_SANDSTONE = BlockSettings.SandstoneSettings();
20+
21+
//SOUL SAND BLOCKS:
22+
23+
public static final Block SOUL_SANDSTONE = BlockSettings.SandstoneSettings();
24+
public static final Block CUT_SOUL_SANDSTONE = BlockSettings.SandstoneSettings();
25+
public static final Block CHISELED_SOUL_SANDSTONE = BlockSettings.SandstoneSettings();
26+
public static final Block WAVY_SOUL_SANDSTONE = BlockSettings.SandstoneSettings();
27+
public static final Block SMOOTH_SOUL_SANDSTONE = BlockSettings.SandstoneSettings();
28+
29+
public static void registerBlocks() {
30+
31+
//STONES:
32+
33+
//Corrite:
34+
Registry.register(Registry.BLOCK, new Identifier(Jineric.MOD_ID, "corrite"), CORRITE);
35+
36+
//Borite:
37+
Registry.register(Registry.BLOCK, new Identifier(Jineric.MOD_ID, "borite"), BORITE);
38+
39+
//SANDSTONES:
40+
Registry.register(Registry.BLOCK, new Identifier(Jineric.MOD_ID, "wavy_sandstone"), WAVY_SANDSTONE);
41+
42+
//SOUL SANDSTONE:
43+
Registry.register(Registry.BLOCK, new Identifier(Jineric.MOD_ID, "cut_soul_sandstone"), CUT_SOUL_SANDSTONE);
44+
Registry.register(Registry.BLOCK, new Identifier(Jineric.MOD_ID, "chiseled_soul_sandstone"), CHISELED_SOUL_SANDSTONE);
45+
Registry.register(Registry.BLOCK, new Identifier(Jineric.MOD_ID, "wavy_soul_sandstone"), WAVY_SOUL_SANDSTONE);
46+
Registry.register(Registry.BLOCK, new Identifier(Jineric.MOD_ID, "smooth_soul_sandstone"), SMOOTH_SOUL_SANDSTONE);
47+
Registry.register(Registry.BLOCK, new Identifier(Jineric.MOD_ID, "soul_sandstone"), SOUL_SANDSTONE);
48+
}
49+
}

‎src/main/java/com/jingy/jineric/registry/ItemSettings.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.jingy.jineric.registry;
2+
3+
import net.minecraft.item.Item;
4+
import net.minecraft.item.ItemGroup;
5+
6+
public class ItemSettings {
7+
public static Item.Settings BuildingBlocks() {
8+
return new Item.Settings().group(ItemGroup.BUILDING_BLOCKS);
9+
}
10+
11+
public static Item.Settings Misc() {
12+
return new Item.Settings().group(ItemGroup.MISC);
13+
}
14+
public static Item.Settings Decoration() {
15+
return new Item.Settings().group(ItemGroup.DECORATIONS);
16+
}
17+
}

src/main/java/com/jingy/jineric/registry/ModItems.java renamed to src/main/java/com/jingy/jineric/registry/Items.java

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
package com.jingy.jineric.registry;
2-
3-
import com.jingy.jineric.Jineric;
4-
import net.minecraft.item.BlockItem;
5-
import net.minecraft.item.FoodComponent;
6-
import net.minecraft.item.Item;
7-
import net.minecraft.item.ItemGroup;
8-
import net.minecraft.util.Identifier;
9-
import net.minecraft.util.registry.Registry;
10-
11-
public class ModItems {
12-
13-
//ITEMS:
14-
15-
//FOODS:
16-
public static final Item GOLDEN_POTATO = new Item(
17-
new Item.Settings().group(ItemGroup.FOOD).food(new FoodComponent.Builder().hunger(6).saturationModifier(14.4f).build()));
18-
19-
public static final Item GOLDEN_SWEET_BERRIES = new Item(
20-
new Item.Settings().group(ItemGroup.FOOD).food(new FoodComponent.Builder().hunger(5).saturationModifier(8f).build()));
21-
22-
public static final Item GOLDEN_BEETROOT = new Item(
23-
new Item.Settings().group(ItemGroup.FOOD).food(new FoodComponent.Builder().hunger(4).saturationModifier(5f).build()));
24-
25-
//BLOCK ITEMS:
26-
public static final BlockItem CORRITE = new BlockItem(ModBlocks.CORRITE, new Item.Settings().group(ItemGroup.BUILDING_BLOCKS));
27-
public static final BlockItem BORITE = new BlockItem(ModBlocks.BORITE, new Item.Settings().group(ItemGroup.BUILDING_BLOCKS));
28-
public static final BlockItem WAVY_SANDSTONE = new BlockItem(ModBlocks.WAVY_SANDSTONE, new Item.Settings().group(ItemGroup.BUILDING_BLOCKS));
29-
public static final BlockItem SOUL_SANDSTONE = new BlockItem(ModBlocks.SOUL_SANDSTONE, new Item.Settings().group(ItemGroup.BUILDING_BLOCKS));
30-
public static final BlockItem CUT_SOUL_SANDSTONE = new BlockItem(ModBlocks.CUT_SOUL_SANDSTONE, new Item.Settings().group(ItemGroup.BUILDING_BLOCKS));
31-
public static final BlockItem CHISELED_SOUL_SANDSTONE = new BlockItem(ModBlocks.CHISELED_SOUL_SANDSTONE, new Item.Settings().group(ItemGroup.BUILDING_BLOCKS));
32-
public static final BlockItem WAVY_SOUL_SANDSTONE = new BlockItem(ModBlocks.WAVY_SOUL_SANDSTONE, new Item.Settings().group(ItemGroup.BUILDING_BLOCKS));
33-
public static final BlockItem SMOOTH_SOUL_SANDSTONE = new BlockItem(ModBlocks.SMOOTH_SOUL_SANDSTONE, new Item.Settings().group(ItemGroup.BUILDING_BLOCKS));
34-
35-
public static void registerItems() {
36-
///ITEMS:
37-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "golden_potato"), GOLDEN_POTATO);
38-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "golden_sweet_berries"), GOLDEN_SWEET_BERRIES);
39-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "golden_beetroot"), GOLDEN_BEETROOT);
40-
41-
//BLOCKS:
42-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "corrite"), CORRITE);
43-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "borite"), BORITE);
44-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "wavy_sandstone"), WAVY_SANDSTONE);
45-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "soul_sandstone"), SOUL_SANDSTONE);
46-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "cut_soul_sandstone"), CUT_SOUL_SANDSTONE);
47-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "chiseled_soul_sandstone"), CHISELED_SOUL_SANDSTONE);
48-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "wavy_soul_sandstone"), WAVY_SOUL_SANDSTONE);
49-
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "smooth_soul_sandstone"), SMOOTH_SOUL_SANDSTONE);
50-
}
51-
52-
}
1+
package com.jingy.jineric.registry;
2+
3+
import com.jingy.jineric.Jineric;
4+
import net.minecraft.item.BlockItem;
5+
import net.minecraft.item.FoodComponent;
6+
import net.minecraft.item.Item;
7+
import net.minecraft.item.ItemGroup;
8+
import net.minecraft.util.Identifier;
9+
import net.minecraft.util.registry.Registry;
10+
11+
public class Items {
12+
13+
//FOODS:
14+
public static final Item GOLDEN_POTATO = new Item(
15+
new Item.Settings().group(ItemGroup.FOOD).food(new FoodComponent.Builder().hunger(6).saturationModifier(14.4f).build()));
16+
17+
public static final Item GOLDEN_SWEET_BERRIES = new Item(
18+
new Item.Settings().group(ItemGroup.FOOD).food(new FoodComponent.Builder().hunger(5).saturationModifier(8f).build()));
19+
20+
public static final Item GOLDEN_BEETROOT = new Item(
21+
new Item.Settings().group(ItemGroup.FOOD).food(new FoodComponent.Builder().hunger(4).saturationModifier(5f).build()));
22+
23+
24+
25+
//BLOCK ITEMS:
26+
public static final BlockItem CORRITE = new BlockItem(Blocks.CORRITE, ItemSettings.BuildingBlocks());
27+
public static final BlockItem BORITE = new BlockItem(Blocks.BORITE, ItemSettings.BuildingBlocks());
28+
public static final BlockItem WAVY_SANDSTONE = new BlockItem(Blocks.WAVY_SANDSTONE, ItemSettings.BuildingBlocks());
29+
public static final BlockItem SOUL_SANDSTONE = new BlockItem(Blocks.SOUL_SANDSTONE, ItemSettings.BuildingBlocks());
30+
public static final BlockItem CUT_SOUL_SANDSTONE = new BlockItem(Blocks.CUT_SOUL_SANDSTONE, ItemSettings.BuildingBlocks());
31+
public static final BlockItem CHISELED_SOUL_SANDSTONE = new BlockItem(Blocks.CHISELED_SOUL_SANDSTONE, ItemSettings.BuildingBlocks());
32+
public static final BlockItem WAVY_SOUL_SANDSTONE = new BlockItem(Blocks.WAVY_SOUL_SANDSTONE, ItemSettings.BuildingBlocks());
33+
public static final BlockItem SMOOTH_SOUL_SANDSTONE = new BlockItem(Blocks.SMOOTH_SOUL_SANDSTONE, ItemSettings.BuildingBlocks());
34+
35+
36+
public static void registerItems() {
37+
//ITEMS:
38+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "golden_potato"), GOLDEN_POTATO);
39+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "golden_sweet_berries"), GOLDEN_SWEET_BERRIES);
40+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "golden_beetroot"), GOLDEN_BEETROOT);
41+
42+
//BLOCKS:
43+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "corrite"), CORRITE);
44+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "borite"), BORITE);
45+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "wavy_sandstone"), WAVY_SANDSTONE);
46+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "soul_sandstone"), SOUL_SANDSTONE);
47+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "cut_soul_sandstone"), CUT_SOUL_SANDSTONE);
48+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "chiseled_soul_sandstone"), CHISELED_SOUL_SANDSTONE);
49+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "wavy_soul_sandstone"), WAVY_SOUL_SANDSTONE);
50+
Registry.register(Registry.ITEM, new Identifier(Jineric.MOD_ID, "smooth_soul_sandstone"), SMOOTH_SOUL_SANDSTONE);
51+
}
52+
}

‎src/main/java/com/jingy/jineric/registry/ModBlocks.java‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎src/main/resources/data/jineric/loot_tables/blocks/borite.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"entries": [
77
{
88
"type": "minecraft:item",
9-
"name": "jineric:borite",
9+
"name": "jineric:borite"
1010
}
1111
],
1212
"conditions": [

‎src/main/resources/fabric.mod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"sources": "https://github.com/Jiingy/Jineric-Mod"
1414
},
1515

16-
"license": "CC0-1.0",
16+
"license": "MIT",
1717
"icon": "assets/jineric/icon.png",
1818

1919
"environment": "*",

0 commit comments

Comments
 (0)