Skip to content

update to 1.20 and add an item group #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DerpDerpling wants to merge 2 commits into
base: 1.19
Choose a base branch
from
Open

update to 1.20 and add an item group #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be42883
update to 1.20 and add an item group
DerpDerpling Jul 14, 2023
2ca0ce1
better version support in fabricmod.json
DerpDerpling Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
org.gradle.jvmargs=-Xmx3G

# Fabric Properties
minecraft_version=1.19.1
yarn_mappings=1.19.1+build.1
loader_version=0.14.8
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.9
loader_version=0.14.21

# Mod Properties
mod_version = 1.0.0+1.19.1
mod_version = 1.0.0+1.20.1
maven_group = com.github.EltrutCo.addendum
archives_base_name = addendum

# Dependencies
fabric_version=0.58.5+1.19.1
fabric_version=0.85.0+1.20.1
2 changes: 2 additions & 0 deletions src/main/java/com/github/EltrutCo/addendum/Addendum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.EltrutCo.addendum;

import com.github.EltrutCo.addendum.registry.AddendumBlocks;
import com.github.EltrutCo.addendum.registry.AddendumItemGroup;
import com.github.EltrutCo.addendum.registry.AddendumItems;
import net.fabricmc.api.ModInitializer;
import net.minecraft.util.Identifier;
Expand All @@ -20,6 +21,7 @@ public void onInitialize() {
AddendumBlocks.init();

log(Level.INFO, "Add-End-Um");
AddendumItemGroup.registerItemGroups();
}

public static void log(Level level, String message){
Expand Down
101 changes: 51 additions & 50 deletions src/main/java/com/github/EltrutCo/addendum/registry/AddendumBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
import com.github.EltrutCo.addendum.Addendum;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.*;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;

public class AddendumBlocks {
// End Stone
Expand Down Expand Up @@ -68,61 +69,61 @@ public class AddendumBlocks {

public static void init() {
// End Stone
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "end_stone_slab"), END_STONE_SLAB);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "end_stone_stairs"), END_STONE_STAIRS);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "end_stone_wall"), END_STONE_WALL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "end_stone_slab"), END_STONE_SLAB);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "end_stone_stairs"), END_STONE_STAIRS);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "end_stone_wall"), END_STONE_WALL);

Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "polished_end_stone"), POLISHED_END_STONE);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "polished_end_stone_slab"), POLISHED_END_STONE_SLAB);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "polished_end_stone_stairs"), POLISHED_END_STONE_STAIRS);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "polished_end_stone_wall"), POLISHED_END_STONE_WALL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "polished_end_stone"), POLISHED_END_STONE);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "polished_end_stone_slab"), POLISHED_END_STONE_SLAB);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "polished_end_stone_stairs"), POLISHED_END_STONE_STAIRS);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "polished_end_stone_wall"), POLISHED_END_STONE_WALL);

Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "chorusy_end_stone_bricks"), CHORUSY_END_STONE_BRICKS);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "chorusy_end_stone_bricks"), CHORUSY_END_STONE_BRICKS);

// Purpur
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "purpur_bricks"), PURPUR_BRICKS);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "purpur_brick_slab"), PURPUR_BRICK_SLAB);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "purpur_brick_stairs"), PURPUR_BRICK_STAIRS);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "purpur_brick_wall"), PURPUR_BRICK_WALL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "purpur_bricks"), PURPUR_BRICKS);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "purpur_brick_slab"), PURPUR_BRICK_SLAB);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "purpur_brick_stairs"), PURPUR_BRICK_STAIRS);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "purpur_brick_wall"), PURPUR_BRICK_WALL);

Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "chiseled_purpur_bricks"), CHISELED_PURPUR_BRICKS);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "popped_chorus_fruit_block"), POPPED_CHORUS_FRUIT_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "chiseled_purpur_bricks"), CHISELED_PURPUR_BRICKS);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "popped_chorus_fruit_block"), POPPED_CHORUS_FRUIT_BLOCK);

//Shulker
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "shulker_block"), SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "shulker_swirl"), SHULKER_SWIRL);

Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "white_shulker_block"), WHITE_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "white_shulker_swirl"), WHITE_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "orange_shulker_block"), ORANGE_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "orange_shulker_swirl"), ORANGE_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "magenta_shulker_block"), MAGENTA_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "magenta_shulker_swirl"), MAGENTA_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "light_blue_shulker_block"), LIGHT_BLUE_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "light_blue_shulker_swirl"), LIGHT_BLUE_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "yellow_shulker_block"), YELLOW_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "yellow_shulker_swirl"), YELLOW_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "lime_shulker_block"), LIME_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "lime_shulker_swirl"), LIME_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "pink_shulker_block"), PINK_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "pink_shulker_swirl"), PINK_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "gray_shulker_block"), GRAY_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "gray_shulker_swirl"), GRAY_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "light_gray_shulker_block"), LIGHT_GRAY_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "light_gray_shulker_swirl"), LIGHT_GRAY_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "cyan_shulker_block"), CYAN_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "cyan_shulker_swirl"), CYAN_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "purple_shulker_block"), PURPLE_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "purple_shulker_swirl"), PURPLE_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "blue_shulker_block"), BLUE_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "blue_shulker_swirl"), BLUE_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "brown_shulker_block"), BROWN_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "brown_shulker_swirl"), BROWN_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "green_shulker_block"), GREEN_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "green_shulker_swirl"), GREEN_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "red_shulker_block"), RED_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "red_shulker_swirl"), RED_SHULKER_SWIRL);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "black_shulker_block"), BLACK_SHULKER_BLOCK);
Registry.register(Registry.BLOCK, new Identifier(Addendum.MODID, "black_shulker_swirl"), BLACK_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "shulker_block"), SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "shulker_swirl"), SHULKER_SWIRL);

Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "white_shulker_block"), WHITE_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "white_shulker_swirl"), WHITE_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "orange_shulker_block"), ORANGE_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "orange_shulker_swirl"), ORANGE_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "magenta_shulker_block"), MAGENTA_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "magenta_shulker_swirl"), MAGENTA_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "light_blue_shulker_block"), LIGHT_BLUE_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "light_blue_shulker_swirl"), LIGHT_BLUE_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "yellow_shulker_block"), YELLOW_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "yellow_shulker_swirl"), YELLOW_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "lime_shulker_block"), LIME_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "lime_shulker_swirl"), LIME_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "pink_shulker_block"), PINK_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "pink_shulker_swirl"), PINK_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "gray_shulker_block"), GRAY_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "gray_shulker_swirl"), GRAY_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "light_gray_shulker_block"), LIGHT_GRAY_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "light_gray_shulker_swirl"), LIGHT_GRAY_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "cyan_shulker_block"), CYAN_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "cyan_shulker_swirl"), CYAN_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "purple_shulker_block"), PURPLE_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "purple_shulker_swirl"), PURPLE_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "blue_shulker_block"), BLUE_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "blue_shulker_swirl"), BLUE_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "brown_shulker_block"), BROWN_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "brown_shulker_swirl"), BROWN_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "green_shulker_block"), GREEN_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "green_shulker_swirl"), GREEN_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "red_shulker_block"), RED_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "red_shulker_swirl"), RED_SHULKER_SWIRL);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "black_shulker_block"), BLACK_SHULKER_BLOCK);
Registry.register(Registries.BLOCK, new Identifier(Addendum.MODID, "black_shulker_swirl"), BLACK_SHULKER_SWIRL);
}
}
71 changes: 71 additions & 0 deletions src/main/java/com/github/EltrutCo/addendum/registry/AddendumItemGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package com.github.EltrutCo.addendum.registry;

import com.github.EltrutCo.addendum.Addendum;
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;

public class AddendumItemGroup {
public static final ItemGroup ADDENDUM_GROUP = Registry.register(Registries.ITEM_GROUP,
new Identifier(Addendum.MODID, "ruby"),
FabricItemGroup.builder().displayName(Text.translatable("itemgroup.addendum"))
.icon(() -> new ItemStack(AddendumItems.CHORUSY_END_STONE_BRICKS_ITEM)).entries((displayContext, entries) -> {
entries.add(AddendumItems.END_STONE_SLAB_ITEM);
entries.add(AddendumItems.END_STONE_STAIRS_ITEM);
entries.add(AddendumItems.END_STONE_WALL_ITEM);
entries.add(AddendumItems.POLISHED_END_STONE_ITEM);
entries.add(AddendumItems.POLISHED_END_STONE_SLAB_ITEM);
entries.add(AddendumItems.POLISHED_END_STONE_STAIRS_ITEM);
entries.add(AddendumItems.POLISHED_END_STONE_WALL_ITEM);
entries.add(AddendumItems.CHORUSY_END_STONE_BRICKS_ITEM);
entries.add(AddendumItems.PURPUR_BRICKS_ITEM);
entries.add(AddendumItems.PURPUR_BRICK_SLAB_ITEM);
entries.add(AddendumItems.PURPUR_BRICK_STAIRS_ITEM);
entries.add(AddendumItems.PURPUR_BRICK_WALL_ITEM);
entries.add(AddendumItems.CHISELED_PURPUR_BRICKS_ITEM);
entries.add(AddendumItems.POPPED_CHORUS_FRUIT_BLOCK_ITEM);
entries.add(AddendumItems.SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.WHITE_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.WHITE_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.ORANGE_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.ORANGE_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.MAGENTA_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.MAGENTA_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.LIGHT_BLUE_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.LIGHT_BLUE_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.YELLOW_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.YELLOW_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.LIME_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.LIME_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.PINK_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.PINK_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.GRAY_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.GRAY_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.LIGHT_GRAY_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.LIGHT_GRAY_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.CYAN_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.CYAN_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.PURPLE_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.PURPLE_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.BLUE_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.BLUE_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.BROWN_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.BROWN_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.GREEN_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.GREEN_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.RED_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.RED_SHULKER_SWIRL_ITEM);
entries.add(AddendumItems.BLACK_SHULKER_BLOCK_ITEM);
entries.add(AddendumItems.BLACK_SHULKER_SWIRL_ITEM);
}).build());


public static void registerItemGroups() {
Addendum.LOGGER.info("Registering Item Groups for " + Addendum.MODID);
}
}
Loading