Skip to content

Commit

Permalink
Re-Add Datagen
Browse files Browse the repository at this point in the history
  • Loading branch information
@EmpressAutumn
EmpressAutumn committed Aug 7, 2024
1 parent 7c0efe8 commit 52e0cdd
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 44 deletions.
6 changes: 5 additions & 1 deletion fabric/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,8 @@ loom {
runDir("runs/server")
}
}
}
}

fabricApi {
configureDataGeneration()
}
16 changes: 10 additions & 6 deletions fabric/src/main/java/com/atom596/titanium/TitaniumDataGenerator.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package com.atom596.titanium;

public class TitaniumDataGenerator /*implements DataGeneratorEntrypoint*/ {/*
import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
import net.minecraft.core.RegistrySetBuilder;

public class TitaniumDataGenerator implements DataGeneratorEntrypoint {
@Override
public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {/*
FabricDataGenerator.Pack pack = fabricDataGenerator.createPack();
pack.addProvider(TitaniumBlockTagProvider::new);
Expand All @@ -13,11 +17,11 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
pack.addProvider(TitaniumWorldGenerator::new);
pack.addProvider(TitaniumAdvancementProvider::new);
pack.addProvider(TitaniumChestLootTableProvider::new);
}
*/}

@Override
public void buildRegistry(RegistryBuilder registryBuilder) {
public void buildRegistry(RegistrySetBuilder registryBuilder) {/*
registryBuilder.addRegistry(RegistryKeys.CONFIGURED_FEATURE, TitaniumConfiguredFeatures::bootstrap);
registryBuilder.addRegistry(RegistryKeys.PLACED_FEATURE, TitaniumPlacedFeatures::bootstrap);
}
*/}
*/}
}
63 changes: 39 additions & 24 deletions fabric/src/main/java/com/atom596/titanium/datagen/TitaniumAdvancementProvider.java
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,80 @@
package com.atom596.titanium.datagen;

public class TitaniumAdvancementProvider /*extends FabricAdvancementProvider*/ {/*
public TitaniumAdvancementProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> completableFuture) {
super(output, completableFuture);
import com.atom596.titanium.Titanium;
import com.atom596.titanium.item.TitaniumItems;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricAdvancementProvider;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementHolder;
import net.minecraft.advancements.AdvancementType;
import net.minecraft.advancements.critereon.InventoryChangeTrigger;
import net.minecraft.core.HolderLookup;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;

import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;

public class TitaniumAdvancementProvider extends FabricAdvancementProvider {
protected TitaniumAdvancementProvider(FabricDataOutput output, CompletableFuture<HolderLookup.Provider> registryLookup) {
super(output, registryLookup);
}

@Override
public void generateAdvancement(RegistryWrapper.WrapperLookup registryLookup, Consumer<AdvancementEntry> consumer) {
AdvancementEntry getTitaniumAdvancement = Advancement.Builder.create()
public void generateAdvancement(HolderLookup.Provider registryLookup, Consumer<AdvancementHolder> consumer) {
AdvancementHolder getTitaniumAdvancement = new Advancement.Builder()
.display(
TitaniumItems.TITANIUM_INGOT,
Text.translatable("advancements.titanium.get_titanium.title"),
Text.translatable("advancements.titanium.get_titanium.description"),
Component.translatable("advancements.titanium.get_titanium.title"),
Component.translatable("advancements.titanium.get_titanium.description"),
null,
AdvancementFrame.TASK,
AdvancementType.TASK,
true,
true,
false
)
.parent(new AdvancementEntry(new Identifier("minecraft", "story/iron_tools"), null))
.criterion("got_titanium", InventoryChangedCriterion.Conditions.items(TitaniumItems.TITANIUM_INGOT))
.build(consumer, Titanium.MOD_ID + "/get_titanium");
.parent(new AdvancementHolder(new ResourceLocation("minecraft", "story/iron_tools"), null))
.addCriterion("got_titanium", InventoryChangeTrigger.TriggerInstance.hasItems(TitaniumItems.TITANIUM_INGOT))
.build(new ResourceLocation(Titanium.MOD_ID, "get_titanium"));

AdvancementEntry titaniumToolsAdvancement = Advancement.Builder.create()
AdvancementHolder titaniumToolsAdvancement = new Advancement.Builder()
.display(
TitaniumItems.TITANIUM_PICKAXE,
Text.translatable("advancements.titanium.titanium_tools.title"),
Text.translatable("advancements.titanium.titanium_tools.description"),
Component.translatable("advancements.titanium.titanium_tools.title"),
Component.translatable("advancements.titanium.titanium_tools.description"),
null,
AdvancementFrame.TASK,
AdvancementType.TASK,
true,
true,
false
)
.parent(getTitaniumAdvancement)
.criterion("get_titanium_tools", InventoryChangedCriterion.Conditions.items(
.addCriterion("get_titanium_tools", InventoryChangeTrigger.TriggerInstance.hasItems(
TitaniumItems.TITANIUM_PICKAXE,
TitaniumItems.TITANIUM_SHOVEL,
TitaniumItems.TITANIUM_AXE,
TitaniumItems.TITANIUM_HOE
))
.build(consumer, Titanium.MOD_ID + "/titanium_tools");
.build(new ResourceLocation(Titanium.MOD_ID, "/titanium_tools"));

AdvancementEntry titaniumArmorAdvancement = Advancement.Builder.create()
AdvancementHolder titaniumArmorAdvancement = new Advancement.Builder()
.display(
TitaniumItems.TITANIUM_CHESTPLATE,
Text.translatable("advancements.titanium.titanium_armor.title"),
Text.translatable("advancements.titanium.titanium_armor.description"),
Component.translatable("advancements.titanium.titanium_armor.title"),
Component.translatable("advancements.titanium.titanium_armor.description"),
null,
AdvancementFrame.TASK,
AdvancementType.TASK,
true,
true,
false
)
.parent(getTitaniumAdvancement)
.criterion("titanium_armor", InventoryChangedCriterion.Conditions.items(
.addCriterion("titanium_armor", InventoryChangeTrigger.TriggerInstance.hasItems(
TitaniumItems.TITANIUM_HELMET,
TitaniumItems.TITANIUM_CHESTPLATE,
TitaniumItems.TITANIUM_LEGGINGS,
TitaniumItems.TITANIUM_BOOTS
))
.build(consumer, Titanium.MOD_ID + "/titanium_armor");
.build(new ResourceLocation(Titanium.MOD_ID, "/titanium_armor"));
}
*/}
}
28 changes: 18 additions & 10 deletions fabric/src/main/java/com/atom596/titanium/datagen/TitaniumBlockLootTableProvider.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
package com.atom596.titanium.datagen;

public class TitaniumBlockLootTableProvider /*extends FabricBlockLootTableProvider*/ {/*
public TitaniumBlockLootTableProvider(FabricDataOutput dataOutput, CompletableFuture<RegistryWrapper.WrapperLookup> completableFuture) {
super(dataOutput, completableFuture);
import com.atom596.titanium.block.TitaniumBlocks;
import com.atom596.titanium.item.TitaniumItems;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
import net.minecraft.core.HolderLookup;

import java.util.concurrent.CompletableFuture;

public class TitaniumBlockLootTableProvider extends FabricBlockLootTableProvider {
protected TitaniumBlockLootTableProvider(FabricDataOutput dataOutput, CompletableFuture<HolderLookup.Provider> registryLookup) {
super(dataOutput, registryLookup);
}

@Override
public void generate() {
addDrop(TitaniumBlocks.TITANIUM_BLOCK);
addDrop(TitaniumBlocks.RAW_TITANIUM_BLOCK);
addDrop(TitaniumBlocks.TITANIUM_LANTERN);
createSelfDropDispatchTable(TitaniumBlocks.TITANIUM_BLOCK, null, null);
createSelfDropDispatchTable(TitaniumBlocks.RAW_TITANIUM_BLOCK, null, null);
createSelfDropDispatchTable(TitaniumBlocks.TITANIUM_LANTERN, null, null);

addDrop(TitaniumBlocks.TITANIUM_ORE, oreDrops(TitaniumBlocks.TITANIUM_ORE, TitaniumItems.RAW_TITANIUM));
addDrop(TitaniumBlocks.DEEPSLATE_TITANIUM_ORE, oreDrops(TitaniumBlocks.DEEPSLATE_TITANIUM_ORE, TitaniumItems.RAW_TITANIUM));
addDrop(TitaniumBlocks.END_TITANIUM_ORE, oreDrops(TitaniumBlocks.END_TITANIUM_ORE, TitaniumItems.RAW_TITANIUM));
createOreDrop(TitaniumBlocks.TITANIUM_ORE, TitaniumItems.RAW_TITANIUM);
createOreDrop(TitaniumBlocks.DEEPSLATE_TITANIUM_ORE, TitaniumItems.RAW_TITANIUM);
createOreDrop(TitaniumBlocks.END_TITANIUM_ORE, TitaniumItems.RAW_TITANIUM);
}
*/}
}
4 changes: 3 additions & 1 deletion fabric/src/main/resources/fabric.mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"entrypoints": {
"main": [
"com.atom596.titanium.TitaniumFabric"
],
"fabric-datagen": [
"com.atom596.titanium.TitaniumDataGenerator"
]
},
"mixins": [
Expand All @@ -33,4 +36,3 @@
"another-mod": "*"
}
}

4 changes: 2 additions & 2 deletions neoforge/src/main/java/com/atom596/titanium/TitaniumNeoforged.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@Mod(Titanium.MOD_ID)
public class TitaniumNeoforged {
public TitaniumNeoforged(IEventBus eventBus) {
Titanium.LOGGER.info("Hello NeoForge world!");
Titanium.init();
Titanium.initialize();
Titanium.LOGGER.info("Initialized Titanium by EmpressAutumn");
}
}

0 comments on commit 52e0cdd

Please sign in to comment.