Skip to content

Commit

Permalink
update: 1.19.2
Browse files Browse the repository at this point in the history
  • Loading branch information
bconlon1 committed May 10, 2024
1 parent db328c4 commit 86e5c6e
Show file tree
Hide file tree
Showing 20 changed files with 571 additions and 572 deletions.
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ org.gradle.daemon=false
mod_id=aether_treasure_reforging
mod_name=Treasure Reforging
mod_version=1.0.0
mc_version=1.19.4
forge_version=45.1.0
mappings=2023.06.26-1.19.4
mc_version=1.19.2
forge_version=43.2.0
mappings=2022.11.27-1.19.2

# Dependencies
aether_version=1.19.4-1.4.2-forge
nitrogen_version=1.19.4-1.0.6-forge
curios_version=1.19.4-5.1.5.3
aether_version=1.19.2-1.4.2-forge
nitrogen_version=1.19.2-1.0.4-forge
curios_version=1.19.2-5.1.4.1

# Publishing
curseforge_id=0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.aetherteam.treasure_reforging;

import com.aetherteam.treasure_reforging.block.ReforgingBlocks;
import com.aetherteam.treasure_reforging.data.ReforgingData;
import com.aetherteam.treasure_reforging.item.ReforgingItems;
import com.aetherteam.treasure_reforging.recipe.TreasureReforgingRecipeSerializers;
import com.mojang.logging.LogUtils;
Expand All @@ -18,7 +17,7 @@ public class TreasureReforging {

public TreasureReforging() {
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
modEventBus.addListener(ReforgingData::dataSetup);
// modEventBus.addListener(ReforgingData::dataSetup);

DeferredRegister<?>[] registers = {
ReforgingBlocks.BLOCKS,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.aetherteam.aether.Aether;
import com.aetherteam.aether.block.miscellaneous.FacingPillarBlock;
import com.aetherteam.aether.item.AetherCreativeTabs;
import com.aetherteam.treasure_reforging.item.ReforgingItems;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
Expand Down Expand Up @@ -38,9 +39,9 @@ private static <B extends Block> Supplier<BlockItem> registerBlockItem(final Reg
return () -> {
B block = Objects.requireNonNull(blockRegistryObject.get());
if (block == PYRAL_BLOCK.get()) {
return new BlockItem(block, new Item.Properties().fireResistant());
return new BlockItem(block, new Item.Properties().fireResistant().tab(AetherCreativeTabs.AETHER_BLOCKS));
} else {
return new BlockItem(block, new Item.Properties());
return new BlockItem(block, new Item.Properties().tab(AetherCreativeTabs.AETHER_BLOCKS));
}
};
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
package com.aetherteam.treasure_reforging.data;

import com.aetherteam.treasure_reforging.data.generators.ReforgingBlockStateData;
import com.aetherteam.treasure_reforging.data.generators.ReforgingItemModelData;
import com.aetherteam.treasure_reforging.data.generators.ReforgingLanguageData;
import com.aetherteam.treasure_reforging.data.generators.ReforgingRecipeData;
import com.aetherteam.treasure_reforging.data.generators.tags.ReforgingBlockTagData;
import com.aetherteam.treasure_reforging.data.generators.tags.ReforgingItemTagData;
import net.minecraft.SharedConstants;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraft.data.metadata.PackMetadataGenerator;
import net.minecraft.network.chat.Component;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.data.event.GatherDataEvent;

import java.util.Map;
import java.util.concurrent.CompletableFuture;

public class ReforgingData {
public static void dataSetup(GatherDataEvent event) {
DataGenerator generator = event.getGenerator();
ExistingFileHelper fileHelper = event.getExistingFileHelper();
CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
PackOutput packOutput = generator.getPackOutput();

// Client Data
generator.addProvider(event.includeClient(), new ReforgingBlockStateData(packOutput, fileHelper));
generator.addProvider(event.includeClient(), new ReforgingItemModelData(packOutput, fileHelper));
generator.addProvider(event.includeClient(), new ReforgingLanguageData(packOutput));

// Server Data
generator.addProvider(event.includeServer(), new ReforgingRecipeData(packOutput));
ReforgingBlockTagData blockTags = new ReforgingBlockTagData(packOutput, lookupProvider, fileHelper);
generator.addProvider(event.includeServer(), blockTags);
generator.addProvider(event.includeServer(), new ReforgingItemTagData(packOutput, lookupProvider, blockTags.contentsGetter(), fileHelper));

// pack.mcmeta
PackMetadataGenerator packMeta = new PackMetadataGenerator(packOutput);
Map<PackType, Integer> packTypes = Map.of(PackType.SERVER_DATA, SharedConstants.getCurrentVersion().getPackVersion(PackType.SERVER_DATA));
packMeta.add(PackMetadataSection.TYPE, new PackMetadataSection(Component.translatable("pack.aether_treasure_reforging.mod.description"), SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES), packTypes));
generator.addProvider(true, packMeta);
}
}
//import com.aetherteam.treasure_reforging.data.generators.ReforgingBlockStateData;
//import com.aetherteam.treasure_reforging.data.generators.ReforgingItemModelData;
//import com.aetherteam.treasure_reforging.data.generators.ReforgingLanguageData;
//import com.aetherteam.treasure_reforging.data.generators.ReforgingRecipeData;
//import com.aetherteam.treasure_reforging.data.generators.tags.ReforgingBlockTagData;
//import com.aetherteam.treasure_reforging.data.generators.tags.ReforgingItemTagData;
//import net.minecraft.SharedConstants;
//import net.minecraft.core.HolderLookup;
//import net.minecraft.data.DataGenerator;
//import net.minecraft.data.PackOutput;
//import net.minecraft.data.metadata.PackMetadataGenerator;
//import net.minecraft.network.chat.Component;
//import net.minecraft.server.packs.PackType;
//import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
//import net.minecraftforge.common.data.ExistingFileHelper;
//import net.minecraftforge.data.event.GatherDataEvent;
//
//import java.util.Map;
//import java.util.concurrent.CompletableFuture;
//
//public class ReforgingData {
// public static void dataSetup(GatherDataEvent event) {
// DataGenerator generator = event.getGenerator();
// ExistingFileHelper fileHelper = event.getExistingFileHelper();
// CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
// PackOutput packOutput = generator.getPackOutput();
//
// // Client Data
// generator.addProvider(event.includeClient(), new ReforgingBlockStateData(packOutput, fileHelper));
// generator.addProvider(event.includeClient(), new ReforgingItemModelData(packOutput, fileHelper));
// generator.addProvider(event.includeClient(), new ReforgingLanguageData(packOutput));
//
// // Server Data
// generator.addProvider(event.includeServer(), new ReforgingRecipeData(packOutput));
// ReforgingBlockTagData blockTags = new ReforgingBlockTagData(packOutput, lookupProvider, fileHelper);
// generator.addProvider(event.includeServer(), blockTags);
// generator.addProvider(event.includeServer(), new ReforgingItemTagData(packOutput, lookupProvider, blockTags.contentsGetter(), fileHelper));
//
// // pack.mcmeta
// PackMetadataGenerator packMeta = new PackMetadataGenerator(packOutput);
// Map<PackType, Integer> packTypes = Map.of(PackType.SERVER_DATA, SharedConstants.getCurrentVersion().getPackVersion(PackType.SERVER_DATA));
// packMeta.add(PackMetadataSection.TYPE, new PackMetadataSection(Component.translatable("pack.aether_treasure_reforging.mod.description"), SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES), packTypes));
// generator.addProvider(true, packMeta);
// }
//}
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package com.aetherteam.treasure_reforging.data.generators;

import com.aetherteam.treasure_reforging.TreasureReforging;
import com.aetherteam.treasure_reforging.block.ReforgingBlocks;
import com.aetherteam.treasure_reforging.data.providers.ReforgingBlockStateProvider;
import net.minecraft.data.PackOutput;
import net.minecraftforge.common.data.ExistingFileHelper;

public class ReforgingBlockStateData extends ReforgingBlockStateProvider {
public ReforgingBlockStateData(PackOutput output, ExistingFileHelper helper) {
super(output, TreasureReforging.MODID, helper);
}

@Override
public void registerStatesAndModels() {
this.pillarTop(ReforgingBlocks.VALKYRUM_BLOCK.get());
this.block(ReforgingBlocks.PYRAL_BLOCK.get(), "construction/");
}
}
//import com.aetherteam.treasure_reforging.TreasureReforging;
//import com.aetherteam.treasure_reforging.block.ReforgingBlocks;
//import com.aetherteam.treasure_reforging.data.providers.ReforgingBlockStateProvider;
//import net.minecraft.data.PackOutput;
//import net.minecraftforge.common.data.ExistingFileHelper;
//
//public class ReforgingBlockStateData extends ReforgingBlockStateProvider {
// public ReforgingBlockStateData(PackOutput output, ExistingFileHelper helper) {
// super(output, TreasureReforging.MODID, helper);
// }
//
// @Override
// public void registerStatesAndModels() {
// this.pillarTop(ReforgingBlocks.VALKYRUM_BLOCK.get());
// this.block(ReforgingBlocks.PYRAL_BLOCK.get(), "construction/");
// }
//}
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package com.aetherteam.treasure_reforging.data.generators;

import com.aetherteam.nitrogen.data.providers.NitrogenItemModelProvider;
import com.aetherteam.treasure_reforging.TreasureReforging;
import com.aetherteam.treasure_reforging.block.ReforgingBlocks;
import com.aetherteam.treasure_reforging.item.ReforgingItems;
import net.minecraft.data.PackOutput;
import net.minecraftforge.common.data.ExistingFileHelper;

public class ReforgingItemModelData extends NitrogenItemModelProvider {
public ReforgingItemModelData(PackOutput output, ExistingFileHelper helper) {
super(output, TreasureReforging.MODID, helper);
}

@Override
protected void registerModels() {
this.item(ReforgingItems.NEPTUNE_MESH.get(), "materials/");
this.item(ReforgingItems.VALKYRUM_INGOT.get(), "materials/");
this.item(ReforgingItems.PYRAL_SHARD.get(), "materials/");
this.item(ReforgingItems.PYRAL_INGOT.get(), "materials/");

this.itemBlock(ReforgingBlocks.VALKYRUM_BLOCK.get());
this.itemBlock(ReforgingBlocks.PYRAL_BLOCK.get());
}
}
//import com.aetherteam.nitrogen.data.providers.NitrogenItemModelProvider;
//import com.aetherteam.treasure_reforging.TreasureReforging;
//import com.aetherteam.treasure_reforging.block.ReforgingBlocks;
//import com.aetherteam.treasure_reforging.item.ReforgingItems;
//import net.minecraft.data.PackOutput;
//import net.minecraftforge.common.data.ExistingFileHelper;
//
//public class ReforgingItemModelData extends NitrogenItemModelProvider {
// public ReforgingItemModelData(PackOutput output, ExistingFileHelper helper) {
// super(output, TreasureReforging.MODID, helper);
// }
//
// @Override
// protected void registerModels() {
// this.item(ReforgingItems.NEPTUNE_MESH.get(), "materials/");
// this.item(ReforgingItems.VALKYRUM_INGOT.get(), "materials/");
// this.item(ReforgingItems.PYRAL_SHARD.get(), "materials/");
// this.item(ReforgingItems.PYRAL_INGOT.get(), "materials/");
//
// this.itemBlock(ReforgingBlocks.VALKYRUM_BLOCK.get());
// this.itemBlock(ReforgingBlocks.PYRAL_BLOCK.get());
// }
//}
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
package com.aetherteam.treasure_reforging.data.generators;

import com.aetherteam.treasure_reforging.block.ReforgingBlocks;
import com.aetherteam.treasure_reforging.data.providers.ReforgingLanguageProvider;
import com.aetherteam.treasure_reforging.item.ReforgingItems;
import net.minecraft.data.PackOutput;

public class ReforgingLanguageData extends ReforgingLanguageProvider {
public ReforgingLanguageData(PackOutput output) {
super(output);
}

@Override
protected void addTranslations() {
this.addBlock(ReforgingBlocks.VALKYRUM_BLOCK, "Block of Valkyrum");
this.addBlock(ReforgingBlocks.PYRAL_BLOCK, "Block of Pyral");

this.addItem(ReforgingItems.NEPTUNE_MESH, "Neptune Mesh");
this.addItem(ReforgingItems.VALKYRUM_INGOT, "Valkyrum Ingot");
this.addItem(ReforgingItems.PYRAL_SHARD, "Pyral Shard");
this.addItem(ReforgingItems.PYRAL_INGOT, "Pyral Ingot");

this.addLore(ReforgingItems.NEPTUNE_MESH, "A mesh of interwoven blue metallic links. With the respective template, it can be used in a Smithing Table to forge Neptune armor.");
this.addLore(ReforgingItems.VALKYRUM_INGOT, "A rare metal utilized by the Valkyries. With the respective template, it can be used in a Smithing Table to forge Valkyrie equipment.");
this.addLore(ReforgingItems.PYRAL_SHARD, "When combined with obsidian, fragments of Pyral material can be used to craft Pyral Ingots. The shard can also function as a long-lasting fuel.");
this.addLore(ReforgingItems.PYRAL_INGOT, "A hardened and fire-resistant ingot. With the respective template, it can be used in a Smithing Table to forge Phoenix armor.");
this.addLore(ReforgingBlocks.VALKYRUM_BLOCK, "A solid block made from Valkyrum Ingots. They can power beacons and be used as decorative accenting.");
this.addLore(ReforgingBlocks.PYRAL_BLOCK, "A solid block made from Pyral Ingots. They can power beacons and have a fiery look to them.");

this.addPackDescription("mod", "The Aether: Treasure Reforging Resources");
}
}
//import com.aetherteam.treasure_reforging.block.ReforgingBlocks;
//import com.aetherteam.treasure_reforging.data.providers.ReforgingLanguageProvider;
//import com.aetherteam.treasure_reforging.item.ReforgingItems;
//import net.minecraft.data.PackOutput;
//
//public class ReforgingLanguageData extends ReforgingLanguageProvider {
// public ReforgingLanguageData(PackOutput output) {
// super(output);
// }
//
// @Override
// protected void addTranslations() {
// this.addBlock(ReforgingBlocks.VALKYRUM_BLOCK, "Block of Valkyrum");
// this.addBlock(ReforgingBlocks.PYRAL_BLOCK, "Block of Pyral");
//
// this.addItem(ReforgingItems.NEPTUNE_MESH, "Neptune Mesh");
// this.addItem(ReforgingItems.VALKYRUM_INGOT, "Valkyrum Ingot");
// this.addItem(ReforgingItems.PYRAL_SHARD, "Pyral Shard");
// this.addItem(ReforgingItems.PYRAL_INGOT, "Pyral Ingot");
//
// this.addLore(ReforgingItems.NEPTUNE_MESH, "A mesh of interwoven blue metallic links. With the respective template, it can be used in a Smithing Table to forge Neptune armor.");
// this.addLore(ReforgingItems.VALKYRUM_INGOT, "A rare metal utilized by the Valkyries. With the respective template, it can be used in a Smithing Table to forge Valkyrie equipment.");
// this.addLore(ReforgingItems.PYRAL_SHARD, "When combined with obsidian, fragments of Pyral material can be used to craft Pyral Ingots. The shard can also function as a long-lasting fuel.");
// this.addLore(ReforgingItems.PYRAL_INGOT, "A hardened and fire-resistant ingot. With the respective template, it can be used in a Smithing Table to forge Phoenix armor.");
// this.addLore(ReforgingBlocks.VALKYRUM_BLOCK, "A solid block made from Valkyrum Ingots. They can power beacons and be used as decorative accenting.");
// this.addLore(ReforgingBlocks.PYRAL_BLOCK, "A solid block made from Pyral Ingots. They can power beacons and have a fiery look to them.");
//
// this.addPackDescription("mod", "The Aether: Treasure Reforging Resources");
// }
//}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.aetherteam.treasure_reforging.data.generators;

import com.aetherteam.treasure_reforging.data.generators.loot.ReforgingBlockLoot;
import com.aetherteam.treasure_reforging.loot.ReforgingLoot;
import net.minecraft.data.PackOutput;
import net.minecraft.data.loot.LootTableProvider;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;

import java.util.List;

public class ReforgingLootTableData {
public static LootTableProvider create(PackOutput output) {
return new LootTableProvider(output, ReforgingLoot.IMMUTABLE_LOOT_TABLES, List.of(
new LootTableProvider.SubProviderEntry(ReforgingBlockLoot::new, LootContextParamSets.BLOCK)
));
}
}
//import com.aetherteam.treasure_reforging.data.generators.loot.ReforgingBlockLoot;
//import com.aetherteam.treasure_reforging.loot.ReforgingLoot;
//import net.minecraft.data.PackOutput;
//import net.minecraft.data.loot.LootTableProvider;
//import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
//
//import java.util.List;
//
//public class ReforgingLootTableData {
// public static LootTableProvider create(PackOutput output) {
// return new LootTableProvider(output, ReforgingLoot.IMMUTABLE_LOOT_TABLES, List.of(
// new LootTableProvider.SubProviderEntry(ReforgingBlockLoot::new, LootContextParamSets.BLOCK)
// ));
// }
//}
Loading

0 comments on commit 86e5c6e

Please sign in to comment.