Skip to content

Commit

Permalink
datagen
Browse files Browse the repository at this point in the history
  • Loading branch information
Thepigcat76 committed Oct 11, 2024
1 parent 38bef19 commit 6cfa665
Show file tree
Hide file tree
Showing 30 changed files with 187 additions and 97 deletions.
18 changes: 9 additions & 9 deletions src/main/java/com/leclowndu93150/carbort/Carbort.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ public class Carbort {
public static final Logger LOGGER = LogUtils.getLogger();

public Carbort(IEventBus modEventBus, ModContainer modContainer) {
new FoodRegistry();
CreativeTabRegistry.CREATIVE_MODE_TABS.register(modEventBus);
ItemRegistry.ITEMS.register(modEventBus);
BlockRegistry.BLOCKS.register(modEventBus);
BlockEntityRegistry.REGISTER.register(modEventBus);
EffectRegistry.EFFECTS.register(modEventBus);
EffectRegistry.POTIONS.register(modEventBus);
DataComponentRegistry.DATA_COMPONENTS.register(modEventBus);
MenuRegistry.MENUS.register(modEventBus);
new CBFoods();
CBTabs.CREATIVE_MODE_TABS.register(modEventBus);
CBItems.ITEMS.register(modEventBus);
CBBlocks.BLOCKS.register(modEventBus);
CBBlockEntities.REGISTER.register(modEventBus);
CBMobEffects.EFFECTS.register(modEventBus);
CBMobEffects.POTIONS.register(modEventBus);
CBDataComponents.DATA_COMPONENTS.register(modEventBus);
CBMenus.MENUS.register(modEventBus);
modEventBus.addListener(this::commonSetup);
modContainer.registerConfig(ModConfig.Type.COMMON, CarbortConfig.SPEC);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.leclowndu93150.carbort.registries.holder;
package com.leclowndu93150.carbort.api;

import com.leclowndu93150.carbort.content.blocks.CakeBlock;
import com.leclowndu93150.carbort.registries.BlockRegistry;
import com.leclowndu93150.carbort.registries.ItemRegistry;
import com.leclowndu93150.carbort.registries.CBBlocks;
import com.leclowndu93150.carbort.registries.CBItems;
import net.minecraft.world.food.FoodProperties;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
Expand All @@ -20,8 +20,8 @@ public class CakeFlavour {

public CakeFlavour(String flavor) {
Flavor = flavor;
BITE = ItemRegistry.ITEMS.register(Flavor + "_bite", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().nutrition(6).saturationModifier(2f).build())));
CAKE_BLOCK = BlockRegistry.BLOCKS.register(Flavor + "_cake", () -> new CakeBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CAKE), BITE));
CAKE_ITEM = ItemRegistry.ITEMS.register(Flavor + "_cake", () -> new BlockItem(CAKE_BLOCK.get(), new Item.Properties()));
BITE = CBItems.ITEMS.register(Flavor + "_bite", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().nutrition(6).saturationModifier(2f).build())));
CAKE_BLOCK = CBBlocks.BLOCKS.register(Flavor + "_cake", () -> new CakeBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CAKE), BITE));
CAKE_ITEM = CBItems.ITEMS.register(Flavor + "_cake", () -> new BlockItem(CAKE_BLOCK.get(), new Item.Properties()));
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.leclowndu93150.carbort.content.blockEntities;

import com.leclowndu93150.carbort.registries.BlockEntityRegistry;
import com.leclowndu93150.carbort.registries.CBBlockEntities;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;

public class SmileyCloudBlockEntity extends BlockEntity {

public SmileyCloudBlockEntity(BlockPos pos, BlockState blockState) {
super(BlockEntityRegistry.SMILEY_CLOUD.get(), pos, blockState);
super(CBBlockEntities.SMILEY_CLOUD.get(), pos, blockState);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.leclowndu93150.carbort.content.blocks;

import com.leclowndu93150.carbort.registries.ItemRegistry;
import com.leclowndu93150.carbort.registries.CBItems;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.ItemLike;
Expand Down Expand Up @@ -31,7 +31,7 @@ public int getMaxAge() {

@Override
protected @NotNull ItemLike getBaseSeedId() {
return ItemRegistry.BEAN;
return CBItems.BEAN;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.leclowndu93150.carbort.content.effects;

import com.leclowndu93150.carbort.registries.ItemRegistry;
import com.leclowndu93150.carbort.registries.CBItems;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectCategory;
Expand All @@ -16,7 +16,7 @@ public SoulTorment(MobEffectCategory type, int col){
public void onMobHurt(LivingEntity livingEntity, int amplifier, DamageSource damageSource, float amount) {
super.onMobHurt(livingEntity, amplifier, damageSource, amount);
if (livingEntity.getHealth() <= 0) {
livingEntity.spawnAtLocation(new ItemStack(ItemRegistry.TORMENTED_SOUL.asItem(), 1));
livingEntity.spawnAtLocation(new ItemStack(CBItems.TORMENTED_SOUL.asItem(), 1));
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.leclowndu93150.carbort.content.energy;

import com.leclowndu93150.carbort.registries.DataComponentRegistry;
import com.leclowndu93150.carbort.registries.CBDataComponents;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.IntTag;
import net.minecraft.nbt.Tag;
Expand All @@ -14,12 +14,12 @@ public class ItemStackEnergyStorage extends EnergyStorage {
public ItemStackEnergyStorage(int capacity, ItemStack itemStack) {
super(capacity, capacity, capacity, 0);
this.itemStack = itemStack;
this.energy = itemStack.getOrDefault(DataComponentRegistry.ENERGY_STORAGE, 0);
this.energy = itemStack.getOrDefault(CBDataComponents.ENERGY_STORAGE, 0);
}

public void setEnergy(int energy) {
this.energy = energy;
itemStack.set(DataComponentRegistry.ENERGY_STORAGE, energy);
itemStack.set(CBDataComponents.ENERGY_STORAGE, energy);
}

@Override
Expand All @@ -30,7 +30,7 @@ public int receiveEnergy(int maxReceive, boolean simulate) {
int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
if (!simulate) {
energy += energyReceived;
itemStack.set(DataComponentRegistry.ENERGY_STORAGE, energy);
itemStack.set(CBDataComponents.ENERGY_STORAGE, energy);
}
return energyReceived;
}
Expand All @@ -43,14 +43,14 @@ public int extractEnergy(int maxExtract, boolean simulate) {
int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
if (!simulate) {
energy -= energyExtracted;
itemStack.set(DataComponentRegistry.ENERGY_STORAGE, energy);
itemStack.set(CBDataComponents.ENERGY_STORAGE, energy);
}
return energyExtracted;
}

@Override
public int getEnergyStored() {
return itemStack.getOrDefault(DataComponentRegistry.ENERGY_STORAGE, 0);
return itemStack.getOrDefault(CBDataComponents.ENERGY_STORAGE, 0);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.leclowndu93150.carbort.content.items;

import com.google.common.collect.Sets;
import com.leclowndu93150.carbort.registries.DataComponentRegistry;
import com.leclowndu93150.carbort.registries.CBDataComponents;
import com.leclowndu93150.carbort.utils.RandomFunctions;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
Expand Down Expand Up @@ -38,16 +38,16 @@ public boolean onDroppedByPlayer(ItemStack item, Player player) {

@Override
public void onCraftedBy(ItemStack stack, Level level, Player player) {
if(!stack.has(DataComponentRegistry.TIMER)){
stack.set(DataComponentRegistry.TIMER, 200);
if(!stack.has(CBDataComponents.TIMER)){
stack.set(CBDataComponents.TIMER, 200);
}
}

@Override
public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotId, boolean isSelected) {
if (stack.has(DataComponentRegistry.TIMER)){
stack.set(DataComponentRegistry.TIMER, stack.get(DataComponentRegistry.TIMER) - 1);
if (stack.get(DataComponentRegistry.TIMER) <= 0){
if (stack.has(CBDataComponents.TIMER)){
stack.set(CBDataComponents.TIMER, stack.get(CBDataComponents.TIMER) - 1);
if (stack.get(CBDataComponents.TIMER) <= 0){
stack.shrink(1);
}
}
Expand All @@ -56,9 +56,9 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotI

@Override
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
if (stack.has(DataComponentRegistry.TIMER)){
tooltipComponents.add(Component.literal("Explosion in "+RandomFunctions.convertTicksToSeconds(stack.get(DataComponentRegistry.TIMER))+" seconds").withStyle(ChatFormatting.GRAY));
} else if (!stack.has(DataComponentRegistry.TIMER)){
if (stack.has(CBDataComponents.TIMER)){
tooltipComponents.add(Component.literal("Explosion in "+RandomFunctions.convertTicksToSeconds(stack.get(CBDataComponents.TIMER))+" seconds").withStyle(ChatFormatting.GRAY));
} else if (!stack.has(CBDataComponents.TIMER)){
tooltipComponents.add(Component.literal("ERROR: Divide by diamond").withStyle(ChatFormatting.GRAY));
tooltipComponents.add(Component.literal("This ingot is highly unstable and will explode after 10 seconds.").withStyle(ChatFormatting.GRAY));
tooltipComponents.add(Component.literal("Will explode if the crafting window is closed or the ingot is thrown on the ground.").withStyle(ChatFormatting.GRAY));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.leclowndu93150.carbort.content.screen;

import com.leclowndu93150.carbort.content.items.ChunkAnalyzerItem;
import com.leclowndu93150.carbort.registries.MenuRegistry;
import com.leclowndu93150.carbort.registries.CBMenus;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
Expand All @@ -11,7 +11,7 @@

public class ChunkAnalyzerMenu extends AbstractContainerMenu {
public ChunkAnalyzerMenu(Player player, int containerId) {
super(MenuRegistry.CHUNK_ANALYZER_MENU.get(), containerId);
super(CBMenus.CHUNK_ANALYZER_MENU.get(), containerId);
}

public ChunkAnalyzerMenu(int id, Inventory inventory, RegistryFriendlyByteBuf data) {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.leclowndu93150.carbort.datagen;

import net.minecraft.data.PackOutput;
import net.neoforged.neoforge.client.model.generators.BlockStateProvider;
import net.neoforged.neoforge.common.data.ExistingFileHelper;

public class CBBlockStateProvider extends BlockStateProvider {
public CBBlockStateProvider(PackOutput output, String modid, ExistingFileHelper exFileHelper) {
super(output, modid, exFileHelper);
}

@Override
protected void registerStatesAndModels() {

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.leclowndu93150.carbort.datagen;

import com.leclowndu93150.carbort.Carbort;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.neoforged.neoforge.common.data.BlockTagsProvider;
import net.neoforged.neoforge.common.data.ExistingFileHelper;
import org.jetbrains.annotations.Nullable;

import java.util.concurrent.CompletableFuture;

public class CBBlockTagProvider extends BlockTagsProvider {
public CBBlockTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
super(output, lookupProvider, Carbort.MODID, existingFileHelper);
}

@Override
protected void addTags(HolderLookup.Provider provider) {

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.leclowndu93150.carbort.datagen;

import net.minecraft.data.PackOutput;
import net.neoforged.neoforge.client.model.generators.ItemModelProvider;
import net.neoforged.neoforge.common.data.ExistingFileHelper;

public class CBItemModelProvider extends ItemModelProvider {
public CBItemModelProvider(PackOutput output, String modid, ExistingFileHelper existingFileHelper) {
super(output, modid, existingFileHelper);
}

@Override
protected void registerModels() {

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.leclowndu93150.carbort.datagen;

import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.minecraft.data.tags.ItemTagsProvider;
import net.minecraft.world.level.block.Block;

import java.util.concurrent.CompletableFuture;

public class CBItemTagProvider extends ItemTagsProvider {
public CBItemTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, CompletableFuture<TagLookup<Block>> blockTags) {
super(output, lookupProvider, blockTags);
}

@Override
protected void addTags(HolderLookup.Provider provider) {

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.leclowndu93150.carbort.datagen;

import com.leclowndu93150.carbort.Carbort;
import net.minecraft.data.PackOutput;
import net.neoforged.neoforge.common.data.LanguageProvider;

public class CBLangProvider extends LanguageProvider {
public CBLangProvider(PackOutput output) {
super(output, Carbort.MODID, "en_us");
}

@Override
protected void addTranslations() {

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.leclowndu93150.carbort.datagen;

import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.minecraft.data.recipes.RecipeOutput;
import net.minecraft.data.recipes.RecipeProvider;

import java.util.concurrent.CompletableFuture;

public class CBRecipesProvider extends RecipeProvider {
public CBRecipesProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
super(output, registries);
}

@Override
protected void buildRecipes(RecipeOutput p_recipeOutput, HolderLookup.Provider holderLookup) {

}
}
24 changes: 24 additions & 0 deletions src/main/java/com/leclowndu93150/carbort/datagen/DataGatherer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.leclowndu93150.carbort.datagen;

import com.leclowndu93150.carbort.Carbort;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.DataGenerator;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.common.data.ExistingFileHelper;
import net.neoforged.neoforge.data.event.GatherDataEvent;

import java.util.concurrent.CompletableFuture;

@EventBusSubscriber(modid = Carbort.MODID)
public final class DataGatherer {
@SubscribeEvent
public static void gatherData(GatherDataEvent event) {
DataGenerator generator = event.getGenerator();
ExistingFileHelper fileHelper = event.getExistingFileHelper();
CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();

boolean assets = event.includeClient();
boolean data = event.includeServer();
}
}

This file was deleted.

25 changes: 0 additions & 25 deletions src/main/java/com/leclowndu93150/carbort/datagen/LangProvider.java

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6cfa665

Please sign in to comment.