Skip to content

Commit cd41034

Browse files
committed
Add match and rescan proxy loot tables, fixes proxies not dropping
1 parent 7cba2a8 commit cd41034

File tree

4 files changed

+52
-7
lines changed

4 files changed

+52
-7
lines changed

src/generated/resources/.cache/cache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ a558989a04a5f19ef48638d1c8046fa657648b44 data/compactcrafting/advancements/recip
1717
45d2dbdc5645834115bb56999d16420aa9629948 data/compactcrafting/advancements/recipes/compactcrafting/projector_dish.json
1818
c1907f3b4dd836b38f84b64e45f2ff6cb691a8fd data/compactcrafting/advancements/recipes/compactcrafting/rescan_proxy.json
1919
665dc63cdbb86e785cf9171a63f83d034a3584ef data/compactcrafting/loot_tables/blocks/field_projector.json
20+
01706dcd83634eea9ad27be909b4a789cfc80d33 data/compactcrafting/loot_tables/blocks/match_proxy.json
21+
7114601a2207f87b722bef4b3bf2fbe11c975073 data/compactcrafting/loot_tables/blocks/rescan_proxy.json
2022
4afba1a945aad9b9fc0e748bf9ee46d7aeb01a70 data/compactcrafting/recipes/base.json
2123
b4bb22914fb3c6cbcef342b0f92a5148b35a0647 data/compactcrafting/recipes/field_projector.json
2224
e87defaaae5226e24b25a72934767c19208868c6 data/compactcrafting/recipes/match_proxy.json
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"type": "minecraft:block",
3+
"pools": [
4+
{
5+
"name": "compactcrafting:match_proxy",
6+
"rolls": 1,
7+
"entries": [
8+
{
9+
"type": "minecraft:item",
10+
"name": "compactcrafting:match_proxy"
11+
}
12+
],
13+
"conditions": [
14+
{
15+
"condition": "minecraft:survives_explosion"
16+
}
17+
]
18+
}
19+
]
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"type": "minecraft:block",
3+
"pools": [
4+
{
5+
"name": "compactcrafting:rescan_proxy",
6+
"rolls": 1,
7+
"entries": [
8+
{
9+
"type": "minecraft:item",
10+
"name": "compactcrafting:rescan_proxy"
11+
}
12+
],
13+
"conditions": [
14+
{
15+
"condition": "minecraft:survives_explosion"
16+
}
17+
]
18+
}
19+
]
20+
}

src/main/java/dev/compactmods/crafting/datagen/LootTableGenerator.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package dev.compactmods.crafting.datagen;
22

3+
import java.util.List;
4+
import java.util.Map;
5+
import java.util.function.BiConsumer;
6+
import java.util.function.Consumer;
7+
import java.util.function.Supplier;
38
import com.google.common.collect.ImmutableList;
49
import com.mojang.datafixers.util.Pair;
510
import dev.compactmods.crafting.Registration;
@@ -13,12 +18,6 @@
1318
import net.minecraft.util.ResourceLocation;
1419
import net.minecraftforge.fml.RegistryObject;
1520

16-
import java.util.List;
17-
import java.util.Map;
18-
import java.util.function.BiConsumer;
19-
import java.util.function.Consumer;
20-
import java.util.function.Supplier;
21-
2221
public class LootTableGenerator extends LootTableProvider {
2322

2423
public LootTableGenerator(DataGenerator dataGeneratorIn) {
@@ -39,6 +38,8 @@ private static class Blocks extends BlockLootTables {
3938
@Override
4039
protected void addTables() {
4140
registerSelfDroppedBlock(Registration.FIELD_PROJECTOR_BLOCK, Registration.FIELD_PROJECTOR_ITEM);
41+
registerSelfDroppedBlock(Registration.MATCH_FIELD_PROXY_BLOCK, Registration.MATCH_PROXY_ITEM);
42+
registerSelfDroppedBlock(Registration.RESCAN_FIELD_PROXY_BLOCK, Registration.RESCAN_PROXY_ITEM);
4243
}
4344

4445
private LootPool.Builder registerSelfDroppedBlock(RegistryObject<Block> block, RegistryObject<Item> item) {
@@ -55,7 +56,9 @@ private LootPool.Builder registerSelfDroppedBlock(RegistryObject<Block> block, R
5556
@Override
5657
protected Iterable<Block> getKnownBlocks() {
5758
return ImmutableList.of(
58-
Registration.FIELD_PROJECTOR_BLOCK.get()
59+
Registration.FIELD_PROJECTOR_BLOCK.get(),
60+
Registration.MATCH_FIELD_PROXY_BLOCK.get(),
61+
Registration.RESCAN_FIELD_PROXY_BLOCK.get()
5962
);
6063
}
6164
}

0 commit comments

Comments
 (0)