Skip to content

Commit 8969df7

Browse files
committed
Allow placing structural glass, reactor glass, and laser focus matrices inside framed blocks
1 parent aab8bcf commit 8969df7

File tree

11 files changed

+38
-7
lines changed

11 files changed

+38
-7
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ if (System.getenv('CURSEFORGE_KEY') != null || project.hasProperty('curseforgeKe
639639
'biomes-o-plenty',
640640
//Misc
641641
'applied-energistics-2', 'ctm', 'curios-continuation', 'dark-mode-everywhere', 'farmers-delight', 'female-gender-forge', 'flux-networks',
642-
'grandpower', 'json-things', 'perviaminvenire', 'projecte', 'recipe-stages'
642+
'framedblocks', 'grandpower', 'json-things', 'perviaminvenire', 'projecte', 'recipe-stages'
643643
)
644644
}
645645

src/datagen/additions/java/mekanism/additions/common/AdditionsTagProvider.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import net.minecraft.core.Holder;
1818
import net.minecraft.core.HolderLookup;
1919
import net.minecraft.data.PackOutput;
20-
import net.minecraft.resources.ResourceLocation;
2120
import net.minecraft.tags.BlockTags;
2221
import net.minecraft.tags.DamageTypeTags;
2322
import net.minecraft.tags.EntityTypeTags;
@@ -34,8 +33,6 @@
3433

3534
public class AdditionsTagProvider extends BaseTagProvider {
3635

37-
private static final TagKey<Block> FRAMEABLE = BlockTags.create(ResourceLocation.fromNamespaceAndPath("framedblocks", "frameable"));
38-
3936
public AdditionsTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
4037
super(output, lookupProvider, MekanismAdditions.MODID, existingFileHelper);
4138
}

src/datagen/generated/mekanism/.cache/f4271571320fe007f5d8ba9eb4461ed6922f6a93

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/framedblocks/tags/block/blockentity_whitelisted.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/framedblocks/tags/block/frameable.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismgenerators/.cache/08f2b53f4cfddb5dc20bb23057cbafdfe1cdd910

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismgenerators/data/framedblocks/tags/block/blockentity_whitelisted.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismgenerators/data/framedblocks/tags/block/frameable.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generators/java/mekanism/generators/common/GeneratorsTagProvider.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.concurrent.CompletableFuture;
55
import mekanism.common.tag.BaseTagProvider;
66
import mekanism.generators.common.registries.GeneratorsBlocks;
7-
import mekanism.generators.common.registries.GeneratorsFluids;
87
import mekanism.generators.common.registries.GeneratorsChemicals;
8+
import mekanism.generators.common.registries.GeneratorsFluids;
99
import net.minecraft.core.Holder;
1010
import net.minecraft.core.HolderLookup;
1111
import net.minecraft.data.PackOutput;
@@ -57,6 +57,9 @@ protected void registerTags(HolderLookup.Provider registries) {
5757
GeneratorsBlocks.FUSION_REACTOR_PORT,
5858
GeneratorsBlocks.FUSION_REACTOR_LOGIC_ADAPTER,
5959
GeneratorsBlocks.LASER_FOCUS_MATRIX);
60+
61+
addToTag(FRAMEABLE, GeneratorsBlocks.REACTOR_GLASS, GeneratorsBlocks.LASER_FOCUS_MATRIX);
62+
addToTag(FB_BE_WHITELIST, GeneratorsBlocks.REACTOR_GLASS, GeneratorsBlocks.LASER_FOCUS_MATRIX);
6063
}
6164

6265
private void addBoxBlacklist() {

src/datagen/main/java/mekanism/common/tag/BaseTagProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public abstract class BaseTagProvider implements DataProvider {
5555

5656
protected static final TagKey<EntityType<?>> PVI_COMPAT = TagKey.create(Registries.ENTITY_TYPE, ResourceLocation.fromNamespaceAndPath("per-viam-invenire", "replace_vanilla_navigator"));
5757
private static final TagKey<Fluid> CREATE_NO_INFINITE_FLUID = FluidTags.create(ResourceLocation.fromNamespaceAndPath("create", "no_infinite_draining"));
58+
protected static final TagKey<Block> FRAMEABLE = BlockTags.create(ResourceLocation.fromNamespaceAndPath("framedblocks", "frameable"));
59+
protected static final TagKey<Block> FB_BE_WHITELIST = BlockTags.create(ResourceLocation.fromNamespaceAndPath("framedblocks", "blockentity_whitelisted"));
5860

5961
private final Map<ResourceKey<? extends Registry<?>>, Map<TagKey<?>, TagBuilder>> supportedTagTypes = new Object2ObjectLinkedOpenHashMap<>();
6062
private final Set<Block> knownHarvestRequirements = new ReferenceOpenHashSet<>();

0 commit comments

Comments
 (0)