Skip to content

Commit

Permalink
fix: missing drops and mining levels on fabrication blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
MrTJP committed May 30, 2024
1 parent 3af7fd5 commit 13eb874
Show file tree
Hide file tree
Showing 11 changed files with 151 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// 1.19.2 2024-05-13T08:16:56.214014 ProjectRed-Fabrication Block Tags
44a36d21accd9b32360c42fd97ae81903501584c data/minecraft/tags/blocks/mineable/pickaxe.json
44a36d21accd9b32360c42fd97ae81903501584c data/minecraft/tags/blocks/needs_stone_tool.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// 1.19.2 2024-05-13T08:21:16.055865 ProjectRed-Fabrication Block Loot Tables
170a77041b752756521029fe2d36dc0952fa584e data/projectred_fabrication/loot_tables/blocks/ic_workbench.json
22bcef3df841e4276c942f4cdfdbe2147bb0a0b7 data/projectred_fabrication/loot_tables/blocks/lithography_table.json
473b02f14e0d6f9558ac074a2a85bccc87f39902 data/projectred_fabrication/loot_tables/blocks/packaging_table.json
8a9d97721b3b18c0ff75aa203c9c033290e1f3dd data/projectred_fabrication/loot_tables/blocks/plotting_table.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
"projectred_fabrication:ic_workbench",
"projectred_fabrication:plotting_table",
"projectred_fabrication:lithography_table",
"projectred_fabrication:packaging_table"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
"projectred_fabrication:ic_workbench",
"projectred_fabrication:plotting_table",
"projectred_fabrication:lithography_table",
"projectred_fabrication:packaging_table"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"name": "projectred_fabrication:ic_workbench"
}
],
"rolls": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"name": "projectred_fabrication:lithography_table"
}
],
"rolls": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"name": "projectred_fabrication:packaging_table"
}
],
"rolls": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"name": "projectred_fabrication:plotting_table"
}
],
"rolls": 1.0
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import codechicken.lib.gui.SimpleCreativeTab;
import codechicken.multipart.api.MultipartType;
import mrtjp.projectred.fabrication.data.FabricationBlockStateModelProvider;
import mrtjp.projectred.fabrication.data.FabricationItemModelProvider;
import mrtjp.projectred.fabrication.data.FabricationLanguageProvider;
import mrtjp.projectred.fabrication.data.FabricationRecipeProvider;
import mrtjp.projectred.fabrication.data.*;
import mrtjp.projectred.fabrication.init.*;
import net.minecraft.data.DataGenerator;
import net.minecraft.world.inventory.MenuType;
Expand Down Expand Up @@ -77,6 +74,8 @@ private void onGatherDataEvent(final GatherDataEvent event) {
generator.addProvider(event.includeClient(), new FabricationItemModelProvider(generator, fileHelper));
generator.addProvider(event.includeClient(), new FabricationLanguageProvider(generator));

generator.addProvider(event.includeServer(), new FabricationBlockTagsProvider(generator, fileHelper));
generator.addProvider(event.includeServer(), new FabricationRecipeProvider(generator));
generator.addProvider(event.includeServer(), new FabricationLootTableProvider(generator));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package mrtjp.projectred.fabrication.data;

import net.minecraft.data.DataGenerator;
import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraft.tags.BlockTags;
import net.minecraftforge.common.data.ExistingFileHelper;
import org.jetbrains.annotations.Nullable;

import static mrtjp.projectred.fabrication.ProjectRedFabrication.MOD_ID;
import static mrtjp.projectred.fabrication.init.FabricationBlocks.*;

public class FabricationBlockTagsProvider extends BlockTagsProvider {

public FabricationBlockTagsProvider(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) {
super(gen, MOD_ID, existingFileHelper);
}

@Override
public String getName() {
return "ProjectRed-Fabrication Block Tags";
}

@Override
protected void addTags() {

tag(BlockTags.MINEABLE_WITH_PICKAXE)
.add(IC_WORKBENCH_BLOCK.get())
.add(PLOTTING_TABLE_BLOCK.get())
.add(LITHOGRAPHY_TABLE_BLOCK.get())
.add(PACKAGING_TABLE_BLOCK.get());

tag(BlockTags.NEEDS_STONE_TOOL)
.add(IC_WORKBENCH_BLOCK.get())
.add(PLOTTING_TABLE_BLOCK.get())
.add(LITHOGRAPHY_TABLE_BLOCK.get())
.add(PACKAGING_TABLE_BLOCK.get());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package mrtjp.projectred.fabrication.data;

import codechicken.lib.datagen.LootTableProvider;
import net.minecraft.data.DataGenerator;

import static mrtjp.projectred.fabrication.init.FabricationBlocks.*;

public class FabricationLootTableProvider extends LootTableProvider.BlockLootProvider {

public FabricationLootTableProvider(DataGenerator dataGenerator) {
super(dataGenerator);
}

@Override
public String getName() {
return "ProjectRed-Fabrication Block Loot Tables";
}

@Override
protected void registerTables() {
register(IC_WORKBENCH_BLOCK.get(), singleItem(IC_WORKBENCH_BLOCK.get()));
register(PLOTTING_TABLE_BLOCK.get(), singleItem(PLOTTING_TABLE_BLOCK.get()));
register(LITHOGRAPHY_TABLE_BLOCK.get(), singleItem(LITHOGRAPHY_TABLE_BLOCK.get()));
register(PACKAGING_TABLE_BLOCK.get(), singleItem(PACKAGING_TABLE_BLOCK.get()));
}
}

0 comments on commit 13eb874

Please sign in to comment.