diff --git a/.gitignore b/.gitignore index c476faf..e1fc65b 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ bin/ # fabric run/ +src/main/generated/.cache/ # java diff --git a/src/main/generated/assets/nethercraft-classic/blockstates/glowood_planks.json b/src/main/generated/assets/nethercraft-classic/blockstates/glowood_planks.json new file mode 100644 index 0000000..b7acd52 --- /dev/null +++ b/src/main/generated/assets/nethercraft-classic/blockstates/glowood_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "nethercraft-classic:block/glowood_planks" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/nethercraft-classic/models/block/glowood_planks.json b/src/main/generated/assets/nethercraft-classic/models/block/glowood_planks.json new file mode 100644 index 0000000..af8a2bc --- /dev/null +++ b/src/main/generated/assets/nethercraft-classic/models/block/glowood_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "nethercraft-classic:block/glowood_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/nethercraft-classic/models/item/glowood_planks.json b/src/main/generated/assets/nethercraft-classic/models/item/glowood_planks.json new file mode 100644 index 0000000..85b474a --- /dev/null +++ b/src/main/generated/assets/nethercraft-classic/models/item/glowood_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "nethercraft-classic:block/glowood_planks" +} \ No newline at end of file diff --git a/src/main/generated/assets/nethercraft-classic/models/item/netherstick.json b/src/main/generated/assets/nethercraft-classic/models/item/netherstick.json new file mode 100644 index 0000000..6db6cc8 --- /dev/null +++ b/src/main/generated/assets/nethercraft-classic/models/item/netherstick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nethercraft-classic:item/netherstick" + } +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/mineable/axe.json b/src/main/generated/data/minecraft/tags/block/mineable/axe.json new file mode 100644 index 0000000..9f04bf5 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/block/mineable/axe.json @@ -0,0 +1,5 @@ +{ + "values": [ + "nethercraft-classic:glowood_planks" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/nethercraft-classic/loot_table/blocks/glowood_planks.json b/src/main/generated/data/nethercraft-classic/loot_table/blocks/glowood_planks.json new file mode 100644 index 0000000..788dcf3 --- /dev/null +++ b/src/main/generated/data/nethercraft-classic/loot_table/blocks/glowood_planks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "nethercraft-classic:glowood_planks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/java/xyz/ibatv/nethercraft/NethercraftClassic.java b/src/main/java/xyz/ibatv/nethercraft/NethercraftClassic.java index fd56146..ed9d6af 100644 --- a/src/main/java/xyz/ibatv/nethercraft/NethercraftClassic.java +++ b/src/main/java/xyz/ibatv/nethercraft/NethercraftClassic.java @@ -5,6 +5,8 @@ import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import xyz.ibatv.nethercraft.block.ModBlocks; +import xyz.ibatv.nethercraft.item.ModItemGroups; +import xyz.ibatv.nethercraft.item.ModItems; public class NethercraftClassic implements ModInitializer { public static final String MOD_ID = "nethercraft-classic"; @@ -23,9 +25,9 @@ public class NethercraftClassic implements ModInitializer { //LOGGER.info("Hello Fabric world!"); - //ModItemGroups.registeritemGroups(); + ModItemGroups.registeritemGroups(); - //ModItems.registerModItems(); + ModItems.registerModItems(); ModBlocks.registerModBlocks(); } } \ No newline at end of file diff --git a/src/main/java/xyz/ibatv/nethercraft/NethercraftClassicDataGenerator.java b/src/main/java/xyz/ibatv/nethercraft/NethercraftClassicDataGenerator.java index 79514f0..5d2bbc7 100644 --- a/src/main/java/xyz/ibatv/nethercraft/NethercraftClassicDataGenerator.java +++ b/src/main/java/xyz/ibatv/nethercraft/NethercraftClassicDataGenerator.java @@ -2,10 +2,17 @@ package xyz.ibatv.nethercraft; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import xyz.ibatv.nethercraft.datagen.*; public class NethercraftClassicDataGenerator implements DataGeneratorEntrypoint { @Override public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { + FabricDataGenerator.Pack pack = fabricDataGenerator.createPack(); + pack.addProvider(ModBlockTagProvider::new); + pack.addProvider(ModItemTagProvider::new); + pack.addProvider(ModLootTableProvider::new); + pack.addProvider(ModModelProvider::new); + pack.addProvider(ModRecipeProvider::new); } } diff --git a/src/main/java/xyz/ibatv/nethercraft/datagen/ModModelProvider.java b/src/main/java/xyz/ibatv/nethercraft/datagen/ModModelProvider.java index 92eeed8..d0e09e2 100644 --- a/src/main/java/xyz/ibatv/nethercraft/datagen/ModModelProvider.java +++ b/src/main/java/xyz/ibatv/nethercraft/datagen/ModModelProvider.java @@ -2,11 +2,11 @@ package xyz.ibatv.nethercraft.datagen; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; +import xyz.ibatv.nethercraft.block.ModBlocks; +import xyz.ibatv.nethercraft.item.ModItems; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.data.client.ItemModelGenerator; import net.minecraft.data.client.Models; -import xyz.ibatv.nethercraft.block.ModBlocks; -import xyz.ibatv.nethercraft.item.ModItems; public class ModModelProvider extends FabricModelProvider { public ModModelProvider(FabricDataOutput output) { @@ -16,11 +16,10 @@ public class ModModelProvider extends FabricModelProvider { @Override public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.GLOWOOD_PLANKS); - } @Override public void generateItemModels(ItemModelGenerator itemModelGenerator) { - //itemModelGenerator.register(ModItems.PROSPERITY_SHARD, Models.GENERATED); + itemModelGenerator.register(ModItems.NETHERSTICK, Models.GENERATED); } } diff --git a/src/main/java/xyz/ibatv/nethercraft/item/ModItemGroups.java b/src/main/java/xyz/ibatv/nethercraft/item/ModItemGroups.java index b5f0a86..1900db3 100644 --- a/src/main/java/xyz/ibatv/nethercraft/item/ModItemGroups.java +++ b/src/main/java/xyz/ibatv/nethercraft/item/ModItemGroups.java @@ -12,10 +12,10 @@ import xyz.ibatv.nethercraft.item.ModItems; import xyz.ibatv.nethercraft.NethercraftClassic; public class ModItemGroups { - public static final ItemGroup MYSTICAL_AGRICULTURE_FABRIC = Registry.register(Registries.ITEM_GROUP, - Identifier.of(NethercraftClassic.MOD_ID, "mystical_agriculture_fabric"), + public static final ItemGroup NETHERCRAFT_GROUP = Registry.register(Registries.ITEM_GROUP, + Identifier.of(NethercraftClassic.MOD_ID, "nethercraft_group"), FabricItemGroup.builder().icon(() -> new ItemStack(ModBlocks.GLOWOOD_PLANKS)) - .displayName(Text.translatable("itemgroup.MysticalAgricultureFabric.mystical_agriculture_fabric")) + .displayName(Text.translatable("itemgroup.nethercraft.nethercraft_group")) .entries((displayContext, entries) -> { //Blocks entries.add(ModBlocks.GLOWOOD_PLANKS); diff --git a/src/main/resources/assets/nethercraft-classic/lang/en_us.json b/src/main/resources/assets/nethercraft-classic/lang/en_us.json new file mode 100644 index 0000000..986e33d --- /dev/null +++ b/src/main/resources/assets/nethercraft-classic/lang/en_us.json @@ -0,0 +1,8 @@ +{ + "itemgroup.nethercraft.nethercraft_group": "Nethercraft", + + "item.nethercraft-classic.netherstick": "Netherstick", + + + "block.nethercraft-classic.glowood_planks": "Glowood Planks" +}