R3944Realms/ModernLifePatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

版本：1.18.2-1.4.6-beta

Browse Source 
* 将部分数据生成交给DataGen来做
- 去除些未用到的import
This commit is contained in:
叁玖领域 2025-03-24 09:23:06 +08:00
parent 8623c59f27
commit c6044f6123
34 changed files with 817 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -6,4 +6,4 @@ org.gradle.daemon=false
mod.id = modernlifepatch
mod.group = com.r3944realms.modernlifepatch
mod.author = r3944Realms
mod.version = 1.18.2-1.4.5-beta
mod.version = 1.18.2-1.4.6-beta

31
qodana.yaml Normal file
View File

@ -0,0 +1,31 @@
#-------------------------------------------------------------------------------#
# Qodana analysis is configured by qodana.yaml file #
# https://www.jetbrains.com/help/qodana/qodana-yaml.html #
#-------------------------------------------------------------------------------#
version: "1.0"
#Specify inspection profile for code analysis
profile:
name: qodana.starter
#Enable inspections
#include:
# - name: <SomeEnabledInspectionId>
#Disable inspections
#exclude:
# - name: <SomeDisabledInspectionId>
# paths:
# - <path/where/not/run/inspection>
projectJDK: 17 #(Applied in CI/CD pipeline)
#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
#bootstrap: sh ./prepare-qodana.sh
#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
#plugins:
# - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
linter: jetbrains/qodana-jvm:latest

21
src/generated/resources/.cache/cache
View File

@ -132,13 +132,21 @@ e34e114a60fcb22fa9407aaa8266668caef15ed6 data/minecraft/advancements/recipes/dec
7d37a1522046bc62fefdb5f7224ec772a848361a data/minecraft/advancements/recipes/decorations/white_concrete_barrier_from_white_concrete_stonecutting.json
89f1730fe4599d5dff277e96a12fbb801a9f8817 data/minecraft/advancements/recipes/decorations/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json
352d3021d7e52bfa00241a78220559017ad182e4 data/minecraft/advancements/recipes/decorations/zero_block_from_null_block_stonecutting.json
74509d78941e40f838c14855f073a57d6c259d99 data/minecraft/advancements/recipes/misc/bullet.json
bcab91745212b58fb613dd964a0a29a1b6762a4a data/minecraft/advancements/recipes/misc/bullet_2.json
39bf663009249d5015a00b6cdee0dc51b9e8faf3 data/minecraft/advancements/recipes/misc/four_bullet_magazine.json
988342071daa9a07bb4aa6e8b0ce6104525861b5 data/minecraft/advancements/recipes/misc/nine_bullet_extended_magazine.json
e30880e316bfc47eef75009d9eb69761b05a3b09 data/minecraft/advancements/recipes/misc/six_bullet_bullet_strip.json
9dfdfa6ed2e15eeb22d6d383ca792baa3cd4f5ee data/minecraft/recipes/black_concrete_barrier_from_black_concrete_stonecutting.json
9ed82a62eae3b6e3e44f6f60f54a0ed07c0d7198 data/minecraft/recipes/blue_concrete_barrier_from_blue_concrete_stonecutting.json
01f7e79edf080e798fc99a9cde3324dad61235ad data/minecraft/recipes/brown_concrete_barrier_from_brown_concrete_stonecutting.json
c442101f0f0f88c0f013cadd62f10c0e1a7f0427 data/minecraft/recipes/bullet.json
f30b7b3e30b1e23123a91c6bf98f02d8cb749b26 data/minecraft/recipes/bullet_2.json
61cb876a155802c028a9441e947b1307a76f9bcf data/minecraft/recipes/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json
4d33f077731631d294153dbda23f66993a4f1e18 data/minecraft/recipes/eight_block_from_null_block_stonecutting.json
5d78d4af8178604aa62bdb150d65738d4779fa43 data/minecraft/recipes/five_block_from_null_block_stonecutting.json
df67f0d9aa8e19a55dcec2e334948a6b3d2453a7 data/minecraft/recipes/four_block_from_null_block_stonecutting.json
cbd7c90c79e60b11a75231ead35732c17025e60e data/minecraft/recipes/four_bullet_magazine.json
a5c93874a3c32623c9bb8ff52f461cac7d64e713 data/minecraft/recipes/gray_concrete_barrier_from_gray_concrete_stonecutting.json
1224ce5fdb8123a0f569ebec701c40982b610c05 data/minecraft/recipes/green_concrete_barrier_from_green_concrete_stonecutting.json
8726a2e9f4ca65e70c27af6632aafb0eeba59450 data/minecraft/recipes/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json
@ -146,6 +154,7 @@ cc14f460974dd834c62070978dfcd6e73adcad0b data/minecraft/recipes/light_gray_concr
33b7e28e49299cd25e773ab55d403f8fbeffb9f4 data/minecraft/recipes/lime_concrete_barrier_from_lime_concrete_stonecutting.json
6509628d9fd935727020347cc9758366bfdb27f5 data/minecraft/recipes/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json
3b4a8677b55ab60aaa0ece86cbccf093cab27313 data/minecraft/recipes/nine_block_from_null_block_stonecutting.json
f48b5a2b9354ed86b74803bb1179bb77c6a73802 data/minecraft/recipes/nine_bullet_extended_magazine.json
beda77c06b8f08fbb49ca12c5ea921cccd4e4a30 data/minecraft/recipes/null_block_from_eight.json
dbb7542a7031c9a7ac41ba4d950a815780416460 data/minecraft/recipes/null_block_from_eight_block_stonecutting.json
2d102c294456a2a2c503e35c1b430c01a313710a data/minecraft/recipes/null_block_from_five.json
@ -174,6 +183,7 @@ c77b4d1f638ae2ca79a261ed098a36335ce3adaf data/minecraft/recipes/purple_concrete_
c1209bbcfbd0aa2c4736bead0e57f4202f437325 data/minecraft/recipes/red_concrete_barrier_from_red_concrete_stonecutting.json
94db4279d39cfaf8d725acc533ee373aece8924d data/minecraft/recipes/seven_block_from_null_block_stonecutting.json
86e66a0ece599c41259ebec14e3bae407b1e03d0 data/minecraft/recipes/six_block_from_null_block_stonecutting.json
c37e48280686f3bb8f38ce2cfdf2e17c224c999f data/minecraft/recipes/six_bullet_bullet_strip.json
7c71493c9d1ca9390c698fdb6607c73ccfaa0d0d data/minecraft/recipes/three_block_from_null_block_stonecutting.json
9bc5f122b5df805cde884f093ae07c7e7754fed1 data/minecraft/recipes/two_block_from_null_block_stonecutting.json
59649b1469011a06386657bc10f03e4bd2f6f416 data/minecraft/recipes/white_concrete_barrier_from_white_concrete_stonecutting.json
@ -221,3 +231,14 @@ ab176773d07c8e9d6a798aa814cdc3b47ddc0594 data/modernlifepatch/recipes/massive_mi
981f4ada5cbf1c4a387846415a916088ab305059 data/modernlifepatch/recipes/mirror.json
f9620cd772cf4ddbeddec1d4b4c686a2e7fbd0c6 data/modernlifepatch/recipes/null_block.json
520f615353aca735689ae25ba5b9d2a0728f97da data/modernlifepatch/recipes/tall_mirror.json
1becf0e6fd8a314f27873a4de1920598eb7d478a data/modernlifepatch/tags/items/bathroom.json
f1f91d804e6d1aa4180d305eafaf354637df142c data/modernlifepatch/tags/items/bedchamber.json
2ff1e9179559bd54ea43126ebc50ca8f7523df11 data/modernlifepatch/tags/items/door.json
af16229018ba92227ad85a9ade9fa065972342f7 data/modernlifepatch/tags/items/general.json
f62a523d04996ded165884ea9cce7479084440c7 data/modernlifepatch/tags/items/kitchen.json
2d43417737bb5eef1033e2fa811f1cb2eaa6d5ba data/modernlifepatch/tags/items/lounge.json
f52a1e6b5c7e5a24d7ad539db24a62c8070f0deb data/modernlifepatch/tags/items/m_tool.json
dd1b2d52731a369e500118dff34e48c63bcd3d5e data/modernlifepatch/tags/items/outside.json
b6ff00d8ce15e61ff485b731f56b5cddc417da2a data/modernlifepatch/tags/items/seat.json
e904c1d09a41897554fec842da01a7db12dc7906 data/modernlifepatch/tags/items/shelf.json
a0bc81b25f981791faee3853ac99ae0fce572349 data/modernlifepatch/tags/items/table.json

34
src/generated/resources/data/minecraft/advancements/recipes/misc/bullet.json Normal file
View File

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"minecraft:bullet"
]
},
"criteria": {
"has_copper": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"minecraft:copper_ingot"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "minecraft:bullet"
}
}
},
"requirements": [
[
"has_copper",
"has_the_recipe"
]
]
}

34
src/generated/resources/data/minecraft/advancements/recipes/misc/bullet_2.json Normal file
View File

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"minecraft:bullet_2"
]
},
"criteria": {
"has_bullet_strip": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"modernlife:bullet_strip"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "minecraft:bullet_2"
}
}
},
"requirements": [
[
"has_bullet_strip",
"has_the_recipe"
]
]
}

34
src/generated/resources/data/minecraft/advancements/recipes/misc/four_bullet_magazine.json Normal file
View File

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"minecraft:four_bullet_magazine"
]
},
"criteria": {
"has_bullet": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"modernlife:bullet"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "minecraft:four_bullet_magazine"
}
}
},
"requirements": [
[
"has_bullet",
"has_the_recipe"
]
]
}

34
src/generated/resources/data/minecraft/advancements/recipes/misc/nine_bullet_extended_magazine.json Normal file
View File

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"minecraft:nine_bullet_extended_magazine"
]
},
"criteria": {
"has_bullet": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"modernlife:bullet"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "minecraft:nine_bullet_extended_magazine"
}
}
},
"requirements": [
[
"has_bullet",
"has_the_recipe"
]
]
}

34
src/generated/resources/data/minecraft/advancements/recipes/misc/six_bullet_bullet_strip.json Normal file
View File

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"minecraft:six_bullet_bullet_strip"
]
},
"criteria": {
"has_bullet": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"modernlife:bullet"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "minecraft:six_bullet_bullet_strip"
}
}
},
"requirements": [
[
"has_bullet",
"has_the_recipe"
]
]
}

5
src/main/resources/data/modernlife/recipes/bullet.json → src/generated/resources/data/minecraft/recipes/bullet.json
View File

@ -9,7 +9,6 @@
}
],
"result": {
"item": "modernlife:bullet",
"count": 1
"item": "modernlife:bullet"
}
}
}

0
src/main/resources/data/modernlife/recipes/bullet_2.json → src/generated/resources/data/minecraft/recipes/bullet_2.json
View File

3
src/main/resources/data/modernlife/recipes/gun_magazine.json → src/generated/resources/data/minecraft/recipes/four_bullet_magazine.json
View File

@ -15,7 +15,6 @@
}
],
"result": {
"item": "modernlife:gun_magazine",
"count": 1
"item": "modernlife:gun_magazine"
}
}

35
src/generated/resources/data/minecraft/recipes/nine_bullet_extended_magazine.json Normal file
View File

@ -0,0 +1,35 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "modernlife:bullet"
},
{
"item": "modernlife:bullet"
},
{
"item": "modernlife:bullet"
},
{
"item": "modernlife:bullet"
},
{
"item": "modernlife:bullet"
},
{
"item": "modernlife:bullet"
},
{
"item": "modernlife:bullet"
},
{
"item": "modernlife:bullet"
},
{
"item": "modernlife:bullet"
}
],
"result": {
"item": "modernlife:extended_gun_magazine"
}
}

3
src/main/resources/data/modernlife/recipes/bullet_strip.json → src/generated/resources/data/minecraft/recipes/six_bullet_bullet_strip.json
View File

@ -21,7 +21,6 @@
}
],
"result": {
"item": "modernlife:bullet_strip",
"count": 1
"item": "modernlife:bullet_strip"
}
}

3
src/main/resources/data/modernlifepatch/tags/items/bathroom.json → src/generated/resources/data/modernlifepatch/tags/items/bathroom.json
View File

@ -11,10 +11,7 @@
"modernlifepatch:massive_mirror",
"modernlife:shower_head",
"modernlife:bathroom_ceramic_tile",
"modernlife:washing_machine",
"modernlife:dryer",
"modernlife:bathtub"
]
}

0
src/main/resources/data/modernlifepatch/tags/items/bedchamber.json → src/generated/resources/data/modernlifepatch/tags/items/bedchamber.json
View File

1
src/main/resources/data/modernlifepatch/tags/items/door.json → src/generated/resources/data/modernlifepatch/tags/items/door.json
View File

@ -23,6 +23,5 @@
"modernlife:glass_oak_trapdoor",
"modernlife:glass_spruce_trapdoor",
"modernlife:glass_warped_trapdoor"
]
}

1
src/main/resources/data/modernlifepatch/tags/items/general.json → src/generated/resources/data/modernlifepatch/tags/items/general.json
View File

@ -91,5 +91,4 @@
"modernlifepatch:nine_block",
"modernlifepatch:zero_block"
]
}

2
src/main/resources/data/modernlifepatch/tags/items/kitchen.json → src/generated/resources/data/modernlifepatch/tags/items/kitchen.json
View File

@ -96,7 +96,5 @@
"modernlife:microwave",
"modernlife:stove",
"modernlife:refrigerator"
]
}

0
src/main/resources/data/modernlifepatch/tags/items/lounge.json → src/generated/resources/data/modernlifepatch/tags/items/lounge.json
View File

0
src/main/resources/data/modernlifepatch/tags/items/m_tool.json → src/generated/resources/data/modernlifepatch/tags/items/m_tool.json
View File

0
src/main/resources/data/modernlifepatch/tags/items/outside.json → src/generated/resources/data/modernlifepatch/tags/items/outside.json
View File

1
src/main/resources/data/modernlifepatch/tags/items/seat.json → src/generated/resources/data/modernlifepatch/tags/items/seat.json
View File

@ -33,6 +33,5 @@
"modernlife:oak_chair",
"modernlife:spruce_chair",
"modernlife:warped_chair"
]
}

3
src/main/resources/data/modernlifepatch/tags/items/shelf.json → src/generated/resources/data/modernlifepatch/tags/items/shelf.json
View File

@ -25,8 +25,5 @@
"modernlife:double_oak_wall_shelf",
"modernlife:double_spruce_wall_shelf",
"modernlife:double_warped_wall_shelf"
]
}

0
src/main/resources/data/modernlifepatch/tags/items/table.json → src/generated/resources/data/modernlifepatch/tags/items/table.json
View File

5
src/main/java/com/r3944realms/modernlifepatch/ClientEventHandler.java
View File

@ -1,7 +1,6 @@
package com.r3944realms.modernlifepatch;
import com.dairymoose.modernlife.core.CustomBlocks;
import com.mojang.blaze3d.vertex.PoseStack;
import com.r3944realms.modernlifepatch.client.event.CreativeScreenEvents;
import com.r3944realms.modernlifepatch.client.renderer.blockentity.MirrorBlockEntityRenderer;
import com.r3944realms.modernlifepatch.content.blocks.ModBlocks;
@ -11,9 +10,6 @@ import net.minecraft.client.renderer.RenderType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.EntityRenderersEvent;
import net.minecraftforge.client.gui.ForgeIngameGui;
import net.minecraftforge.client.gui.IIngameOverlay;
import net.minecraftforge.client.gui.OverlayRegistry;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@ -29,7 +25,6 @@ public abstract class ClientEventHandler {
@OnlyIn(Dist.CLIENT)
public static void onClientSetup(FMLClientSetupEvent event) {
event.enqueueWork(() -> {
ItemBlockRenderTypes.setRenderLayer(ModBlocks.MASSIVE_MIRROR.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.LARGE_MIRROR.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(CustomBlocks.BLOCK_ACACIA_CHAIR.get(), RenderType.cutout());

1
src/main/java/com/r3944realms/modernlifepatch/CommonEventHandler.java
View File

@ -2,7 +2,6 @@ package com.r3944realms.modernlifepatch;
import net.minecraft.server.packs.repository.Pack;
import net.minecraft.server.packs.repository.PackSource;
import net.minecraftforge.client.model.obj.OBJLoader;
import net.minecraftforge.event.AddPackFindersEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModList;

10
src/main/java/com/r3944realms/modernlifepatch/content/blocks/type/mirror/MirrorBlock.java
View File

@ -1,6 +1,5 @@
package com.r3944realms.modernlifepatch.content.blocks.type.mirror;
import com.dairymoose.modernlife.blocks.GrateBlock;
import com.r3944realms.modernlifepatch.content.blocks.blockstate.ModBlockStateProperties;
import com.r3944realms.modernlifepatch.content.blocks.entities.type.mirror.MirrorBlockEntity;
import com.r3944realms.modernlifepatch.content.blocks.type.mirror.shape.IMirrorShape;
@ -12,7 +11,10 @@ import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.*;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.block.*;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
@ -22,16 +24,12 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.block.state.properties.EnumProperty;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.Optional;
public class MirrorBlock extends HorizontalDirectionalBlock implements EntityBlock, SimpleWaterloggedBlock {
public static final EnumProperty<MirrorPart> PART = ModBlockStateProperties.MIRROR_PART;

15
src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockStateProvider.java
View File

@ -5,10 +5,7 @@ import com.r3944realms.modernlifepatch.content.blocks.ModBlocks;
import net.minecraft.data.DataGenerator;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.Block;
import net.minecraftforge.client.model.generators.BlockModelBuilder;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.client.model.generators.ModelProvider;
import net.minecraftforge.client.model.generators.*;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.registries.ForgeRegistries;
@ -16,17 +13,9 @@ public class ModBlockStateProvider extends BlockStateProvider {
public ModBlockStateProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) {
super(generator, ModernLifePatch.MOD_ID, existingFileHelper);
}
public void registerStatesAndModels(Block block) {
this.simpleBlock(block, this.cubeAll(block));
}
public ResourceLocation blockTextureSuffix(Block block,String suffix) {
ResourceLocation name = key(block);
return new ResourceLocation(name.getNamespace(), ModelProvider.BLOCK_FOLDER + "/" + name.getPath() + suffix);
}
private ResourceLocation key(Block block) {
return ForgeRegistries.BLOCKS.getKey(block);
}
@Override
protected void registerStatesAndModels() {
registerBarrierStates(ModBlocks.LIGHT_GRAY_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/light_gray_concrete_barrier"));
@ -67,8 +56,6 @@ public class ModBlockStateProvider extends BlockStateProvider {
horizontalBlock(block, existingFile, 0);
simpleBlockItem(block, existingFile);
}
public String name(Block block) {
return key(block).getPath();
}

3
src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockTagProvider.java
View File

@ -1,10 +1,7 @@
package com.r3944realms.modernlifepatch.datagen.provider;
import com.r3944realms.modernlifepatch.ClientEventHandler;
import com.r3944realms.modernlifepatch.ModernLifePatch;
import com.r3944realms.modernlifepatch.common.ModTags;
import com.r3944realms.modernlifepatch.content.blocks.ModBlocks;
import com.r3944realms.modernlifepatch.content.items.ModItems;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraft.tags.BlockTags;

1
src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModItemModelProvider.java
View File

@ -4,7 +4,6 @@ import com.r3944realms.modernlifepatch.ModernLifePatch;
import com.r3944realms.modernlifepatch.content.items.ModItems;
import net.minecraft.data.DataGenerator;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraftforge.client.model.generators.ItemModelProvider;
import net.minecraftforge.common.data.ExistingFileHelper;

542
src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModItemTagProvider.java
View File

@ -1,13 +1,12 @@
package com.r3944realms.modernlifepatch.datagen.provider;
import com.dairymoose.modernlife.blocks.BarrierBlock;
import com.dairymoose.modernlife.core.CustomBlocks;
import com.r3944realms.modernlifepatch.ModernLifePatch;
import com.r3944realms.modernlifepatch.common.ModTags;
import com.r3944realms.modernlifepatch.content.items.ModItems;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraft.data.tags.ItemTagsProvider;
import net.minecraft.world.item.BlockItem;
import net.minecraftforge.common.data.ExistingFileHelper;
import org.jetbrains.annotations.Nullable;
@ -18,18 +17,531 @@ public class ModItemTagProvider extends ItemTagsProvider {
@Override
protected void addTags() {
// this.tag(ModTags.Items.GENERAL);
// this.tag(ModTags.Items.KITCHEN);
// this.tag(ModTags.Items.BEDCHAMBER);
// this.tag(ModTags.Items.BEDCHAMBER);
// this.tag(ModTags.Items.BATHROOM);
// this.tag(ModTags.Items.BATHROOM);
// this.tag(ModTags.Items.LOUNGE);
// this.tag(ModTags.Items.OUTSIDE);
// this.tag(ModTags.Items.TOOL);
// this.tag(ModTags.Items.SEAT);
// this.tag(ModTags.Items.TABLE);
// this.tag(ModTags.Items.SHELF);
// this.tag(ModTags.Items.DOOR);
this.tag(ModTags.Items.BATHROOM)
.add(
CustomBlocks.ITEM_MIRROR.get(),
CustomBlocks.ITEM_TALL_MIRROR.get(),
CustomBlocks.ITEM_LARGE_MIRROR.get(),
CustomBlocks.ITEM_MASSIVE_MIRROR.get(),
ModItems.MIRROR_ITEM.get(),
ModItems.TALL_MIRROR_ITEM.get(),
ModItems.LARGE_MIRROR_ITEM.get(),
ModItems.MASSIVE_MIRROR_ITEM.get(),
CustomBlocks.ITEM_SHOWER_HEAD.get(),
CustomBlocks.ITEM_BATHROOM_CERAMIC_TILE.get(),
CustomBlocks.ITEM_DRYER.get(),
CustomBlocks.ITEM_BATHTUB.get()
);
this.tag(ModTags.Items.BEDCHAMBER)
.add(
CustomBlocks.ITEM_ACACIA_NIGHT_STAND.get(),
CustomBlocks.ITEM_BIRCH_NIGHT_STAND.get(),
CustomBlocks.ITEM_CRIMSON_NIGHT_STAND.get(),
CustomBlocks.ITEM_DARK_OAK_NIGHT_STAND.get(),
CustomBlocks.ITEM_JUNGLE_NIGHT_STAND.get(),
CustomBlocks.ITEM_OAK_NIGHT_STAND.get(),
CustomBlocks.ITEM_SPRUCE_NIGHT_STAND.get(),
CustomBlocks.ITEM_WARPED_NIGHT_STAND.get(),
CustomBlocks.ITEM_ALARM_CLOCK.get(),
CustomBlocks.ITEM_DELUXE_BED.get()
);
this.tag(ModTags.Items.DOOR)
.add(
CustomBlocks.ITEM_ACACIA_GLASS_DOOR.get(),
CustomBlocks.ITEM_MODERN_WHITE_DOOR.get(),
CustomBlocks.ITEM_BIRCH_GLASS_DOOR.get(),
CustomBlocks.ITEM_CRIMSON_GLASS_DOOR.get(),
CustomBlocks.ITEM_DARK_OAK_GLASS_DOOR.get(),
CustomBlocks.ITEM_GLASS_DOOR.get(),
CustomBlocks.ITEM_IRON_GLASS_DOOR.get(),
CustomBlocks.ITEM_JUNGLE_GLASS_DOOR.get(),
CustomBlocks.ITEM_OAK_GLASS_DOOR.get(),
CustomBlocks.ITEM_SPRUCE_GLASS_DOOR.get(),
CustomBlocks.ITEM_WARPED_GLASS_DOOR.get(),
CustomBlocks.ITEM_JAIL_DOOR.get(),
CustomBlocks.ITEM_GLASS_TRAPDOOR.get(),
CustomBlocks.ITEM_GLASS_ACACIA_TRAPDOOR.get(),
CustomBlocks.ITEM_GLASS_BIRCH_TRAPDOOR.get(),
CustomBlocks.ITEM_GLASS_CRIMSON_TRAPDOOR.get(),
CustomBlocks.ITEM_GLASS_DARK_OAK_TRAPDOOR.get(),
CustomBlocks.ITEM_GLASS_IRON_TRAPDOOR.get(),
CustomBlocks.ITEM_GLASS_JUNGLE_TRAPDOOR.get(),
CustomBlocks.ITEM_GLASS_OAK_TRAPDOOR.get(),
CustomBlocks.ITEM_GLASS_SPRUCE_TRAPDOOR.get(),
CustomBlocks.ITEM_GLASS_WARPED_TRAPDOOR.get()
);
this.tag(ModTags.Items.GENERAL)
.add(
CustomBlocks.ITEM_MONITOR.get(),
CustomBlocks.ITEM_DUAL_MONITOR.get(),
CustomBlocks.ITEM_RADIATOR.get(),
CustomBlocks.ITEM_CCTV_CAMERA.get(),
CustomBlocks.ITEM_CCTV_SCREEN.get(),
CustomBlocks.ITEM_GLASS_STAIRS.get(),
CustomBlocks.ITEM_METAL_CATWALK.get(),
CustomBlocks.ITEM_CEILING_FAN.get(),
CustomBlocks.ITEM_ELECTRICAL_OUTLET.get(),
CustomBlocks.ITEM_METAL_DUCT.get(),
CustomBlocks.ITEM_GLASS_PANEL.get(),
CustomBlocks.ITEM_TILE_LIGHT.get(),
CustomBlocks.ITEM_BEIGE_CERAMIC_TILE.get(),
CustomBlocks.ITEM_WHITE_CERAMIC_TILE.get(),
CustomBlocks.ITEM_BROWN_CERAMIC_TILE.get(),
CustomBlocks.ITEM_ROCKY_CERAMIC_TILE.get(),
CustomBlocks.ITEM_BLACK_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_BLUE_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_BROWN_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_CYAN_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_GRAY_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_GREEN_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_LIGHT_BLUE_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_LIGHT_GRAY_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_LIME_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_MAGENTA_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_ORANGE_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_PINK_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_PURPLE_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_RED_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_WHITE_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_YELLOW_PAINTED_DRYWALL.get(),
CustomBlocks.ITEM_TRASH_CAN.get(),
CustomBlocks.ITEM_WINCH.get(),
CustomBlocks.ITEM_WINCH_ANCHOR.get(),
CustomBlocks.ITEM_TURNTABLE.get(),
CustomBlocks.ITEM_SPEEDOMETER.get(),
CustomBlocks.ITEM_PAVED_ROAD.get(),
CustomBlocks.ITEM_BATTERY.get(),
CustomBlocks.ITEM_BICYCLE.get(),
CustomBlocks.ITEM_MOTORBOAT.get(),
CustomBlocks.ITEM_TIRE.get(),
CustomBlocks.ITEM_CHESS_BOARD.get(),
CustomBlocks.ITEM_COFFEE_MUG.get(),
CustomBlocks.ITEM_INSET_LIGHT.get(),
CustomBlocks.ITEM_MUSIC_STAND.get(),
CustomBlocks.ITEM_PRINTER.get(),
CustomBlocks.ITEM_PHOTOCOPIER.get(),
CustomBlocks.ITEM_CAMERA.get(),
CustomBlocks.ITEM_GAS_CAN.get(),
CustomBlocks.ITEM_CHESS_ROOK.get(),
CustomBlocks.ITEM_CHESS_BISHOP.get(),
CustomBlocks.ITEM_CHESS_PAWN.get(),
CustomBlocks.ITEM_CHESS_KNIGHT.get(),
CustomBlocks.ITEM_CHESS_KING.get(),
CustomBlocks.ITEM_CHESS_QUEEN.get(),
CustomBlocks.ITEM_CHESS_ROOK_W.get(),
CustomBlocks.ITEM_CHESS_BISHOP_W.get(),
CustomBlocks.ITEM_CHESS_PAWN_W.get(),
CustomBlocks.ITEM_CHESS_KNIGHT_W.get(),
CustomBlocks.ITEM_CHESS_KING_W.get(),
CustomBlocks.ITEM_CHESS_QUEEN_W.get(),
CustomBlocks.ITEM_MEMORY_CARD.get(),
CustomBlocks.ITEM_ROAD_MARKER.get(),
CustomBlocks.ITEM_ROAD_MARKER_WHITE.get(),
CustomBlocks.ITEM_ROAD_MARKER_WHITE_INCLINE.get(),
CustomBlocks.ITEM_ROAD_MARKER_YELLOW.get(),
CustomBlocks.ITEM_ROAD_MARKER_YELLOW_INCLINE.get(),
CustomBlocks.ITEM_ROAD_MARKER_DOUBLE_YELLOW.get(),
CustomBlocks.ITEM_ROAD_MARKER_DOUBLE_YELLOW_INCLINE.get(),
CustomBlocks.ITEM_ROAD_MARKER_WHITE_SHOULDER_LEFT.get(),
CustomBlocks.ITEM_ROAD_MARKER_WHITE_SHOULDER_LEFT_INCLINE.get(),
CustomBlocks.ITEM_ROAD_MARKER_WHITE_SHOULDER_RIGHT.get(),
CustomBlocks.ITEM_ROAD_MARKER_WHITE_SHOULDER_RIGHT_INCLINE.get(),
CustomBlocks.ITEM_ROAD_MARKER_WHITE_CORNER_LEFT.get(),
CustomBlocks.ITEM_ROAD_MARKER_WHITE_CORNER_LEFT_INCLINE.get(),
CustomBlocks.ITEM_ROAD_MARKER_WHITE_CORNER_RIGHT.get(),
CustomBlocks.ITEM_ROAD_MARKER_WHITE_CORNER_RIGHT_INCLINE.get(),
ModItems.NULL_BLOCK_ITEM.get(),
ModItems.ONE_BLOCK_ITEM.get(),
ModItems.TWO_BLOCK_ITEM.get(),
ModItems.THREE_BLOCK_ITEM.get(),
ModItems.FOUR_BLOCK_ITEM.get(),
ModItems.FIVE_BLOCK_ITEM.get(),
ModItems.SIX_BLOCK_ITEM.get(),
ModItems.SEVEN_BLOCK_ITEM.get(),
ModItems.EIGHT_BLOCK_ITEM.get(),
ModItems.NINE_BLOCK_ITEM.get(),
ModItems.ZERO_BLOCK_ITEM.get()
);
this.tag(ModTags.Items.KITCHEN)
.add(
CustomBlocks.ITEM_KITCHEN_SINK.get(),
CustomBlocks.ITEM_ACACIA_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_BIRCH_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_DARK_OAK_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_CRIMSON_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_JUNGLE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_OAK_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_SPRUCE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_WARPED_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_COBBLESTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_STONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_STONE_BRICKS_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_CRACKED_STONE_BRICKS_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_MOSSY_STONE_BRICKS_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_CHISELED_STONE_BRICKS_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_CLAY_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_SAND_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_RED_SAND_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_SMOOTH_STONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_GRAVEL_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_GRANITE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_POLISHED_GRANITE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_DIORITE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_POLISHED_DIORITE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_OBSIDIAN_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_ANDESITE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_POLISHED_ANDESITE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_MOSSY_COBBLESTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_BRICKS_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_TERRACOTTA_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_SANDSTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_CHISELED_SANDSTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_CUT_SANDSTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_RED_SANDSTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_CHISELED_RED_SANDSTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_CUT_RED_SANDSTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_PRISMARINE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_PRISMARINE_BRICKS_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_DARK_PRISMARINE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_BLACKSTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_POLISHED_BLACKSTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_POLISHED_BLACKSTONE_BRICKS_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_CHISELED_POLISHED_BLACKSTONE_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_NETHERRACK_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_NETHER_BRICKS_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_CHISELED_NETHER_BRICKS_KITCHEN_CABINET.get(),
CustomBlocks.ITEM_ACACIA_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_BIRCH_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_CRIMSON_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_DARK_OAK_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_JUNGLE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_OAK_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_SPRUCE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_WARPED_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_COBBLESTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_STONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_STONE_BRICKS_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_CRACKED_STONE_BRICKS_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_MOSSY_STONE_BRICKS_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_CHISELED_STONE_BRICKS_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_CLAY_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_SAND_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_RED_SAND_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_SMOOTH_STONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_GRAVEL_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_GRANITE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_POLISHED_GRANITE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_DIORITE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_POLISHED_DIORITE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_OBSIDIAN_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_ANDESITE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_POLISHED_ANDESITE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_MOSSY_COBBLESTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_BRICKS_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_TERRACOTTA_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_SANDSTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_CHISELED_SANDSTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_CUT_SANDSTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_RED_SANDSTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_CHISELED_RED_SANDSTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_CUT_RED_SANDSTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_PRISMARINE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_PRISMARINE_BRICKS_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_DARK_PRISMARINE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_BLACKSTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_POLISHED_BLACKSTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_POLISHED_BLACKSTONE_BRICKS_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_CHISELED_POLISHED_BLACKSTONE_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_NETHERRACK_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_NETHER_BRICKS_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_CHISELED_NETHER_BRICKS_KITCHEN_DRAWER_CABINET.get(),
CustomBlocks.ITEM_HOT_WATER_HEATER.get(),
CustomBlocks.ITEM_MICROWAVE.get(),
CustomBlocks.ITEM_STOVE.get(),
CustomBlocks.ITEM_REFRIGERATOR.get()
);
this.tag(ModTags.Items.LOUNGE)
.add(
CustomBlocks.ITEM_AIR_CONDITIONER.get(),
CustomBlocks.ITEM_METAL_GRATE.get(),
CustomBlocks.ITEM_LIGHT_BULB.get(),
CustomBlocks.ITEM_ARROW_SLIT.get(),
CustomBlocks.ITEM_OLD_TV.get(),
CustomBlocks.ITEM_FLATSCREEN_TV.get()
);
this.tag(ModTags.Items.TOOL)
.add(
CustomBlocks.ITEM_BULLET_STRIP.get(),
CustomBlocks.ITEM_MAGAZINE.get(),
CustomBlocks.ITEM_EXTENDED_MAGAZINE.get(),
CustomBlocks.ITEM_GUITAR.get(),
CustomBlocks.ITEM_GUITAR_AMPLIFIER.get(),
CustomBlocks.ITEM_SEED_SPREADER.get(),
CustomBlocks.ITEM_POWER_TRANSMITTER.get(),
CustomBlocks.ITEM_POWER_RECEIVER.get(),
CustomBlocks.ITEM_HANDGUN.get(),
CustomBlocks.ITEM_FLASHLIGHT.get()
);
this.tag(ModTags.Items.OUTSIDE)
.add(
CustomBlocks.ITEM_COBBLESTONE_RAMP.get(),
CustomBlocks.ITEM_STONE_RAMP.get(),
CustomBlocks.ITEM_STONE_BRICKS_RAMP.get(),
CustomBlocks.ITEM_CRACKED_STONE_BRICKS_RAMP.get(),
CustomBlocks.ITEM_MOSSY_STONE_BRICKS_RAMP.get(),
CustomBlocks.ITEM_CHISELED_STONE_BRICKS_RAMP.get(),
CustomBlocks.ITEM_CLAY_RAMP.get(),
CustomBlocks.ITEM_SAND_RAMP.get(),
CustomBlocks.ITEM_RED_SAND_RAMP.get(),
CustomBlocks.ITEM_SMOOTH_STONE_RAMP.get(),
CustomBlocks.ITEM_DIRT_RAMP.get(),
CustomBlocks.ITEM_DEEPSLATE_RAMP.get(),
CustomBlocks.ITEM_COBBLED_DEEPSLATE_RAMP.get(),
CustomBlocks.ITEM_QUARTZ_RAMP.get(),
CustomBlocks.ITEM_SMOOTH_QUARTZ_RAMP.get(),
CustomBlocks.ITEM_CHISELED_QUARTZ_RAMP.get(),
CustomBlocks.ITEM_QUARTZ_BRICKS_RAMP.get(),
CustomBlocks.ITEM_QUARTZ_PILLAR_RAMP.get(),
CustomBlocks.ITEM_GLASS_RAMP.get(),
CustomBlocks.ITEM_ACACIA_LOG_RAMP.get(),
CustomBlocks.ITEM_STRIPPED_ACACIA_LOG_RAMP.get(),
CustomBlocks.ITEM_BIRCH_LOG_RAMP.get(),
CustomBlocks.ITEM_STRIPPED_BIRCH_LOG_RAMP.get(),
CustomBlocks.ITEM_CRIMSON_LOG_RAMP.get(),
CustomBlocks.ITEM_STRIPPED_CRIMSON_LOG_RAMP.get(),
CustomBlocks.ITEM_DARK_OAK_LOG_RAMP.get(),
CustomBlocks.ITEM_STRIPPED_DARK_OAK_LOG_RAMP.get(),
CustomBlocks.ITEM_JUNGLE_LOG_RAMP.get(),
CustomBlocks.ITEM_STRIPPED_JUNGLE_LOG_RAMP.get(),
CustomBlocks.ITEM_OAK_LOG_RAMP.get(),
CustomBlocks.ITEM_STRIPPED_OAK_LOG_RAMP.get(),
CustomBlocks.ITEM_SPRUCE_LOG_RAMP.get(),
CustomBlocks.ITEM_STRIPPED_SPRUCE_LOG_RAMP.get(),
CustomBlocks.ITEM_WARPED_LOG_RAMP.get(),
CustomBlocks.ITEM_STRIPPED_WARPED_LOG_RAMP.get(),
CustomBlocks.ITEM_GRAVEL_RAMP.get(),
CustomBlocks.ITEM_GRANITE_RAMP.get(),
CustomBlocks.ITEM_POLISHED_GRANITE_RAMP.get(),
CustomBlocks.ITEM_DIORITE_RAMP.get(),
CustomBlocks.ITEM_POLISHED_DIORITE_RAMP.get(),
CustomBlocks.ITEM_OBSIDIAN_RAMP.get(),
CustomBlocks.ITEM_ANDESITE_RAMP.get(),
CustomBlocks.ITEM_POLISHED_ANDESITE_RAMP.get(),
CustomBlocks.ITEM_MOSSY_COBBLESTONE_RAMP.get(),
CustomBlocks.ITEM_BRICKS_RAMP.get(),
CustomBlocks.ITEM_TERRACOTTA_RAMP.get(),
CustomBlocks.ITEM_SANDSTONE_RAMP.get(),
CustomBlocks.ITEM_CHISELED_SANDSTONE_RAMP.get(),
CustomBlocks.ITEM_CUT_SANDSTONE_RAMP.get(),
CustomBlocks.ITEM_RED_SANDSTONE_RAMP.get(),
CustomBlocks.ITEM_CHISELED_RED_SANDSTONE_RAMP.get(),
CustomBlocks.ITEM_CUT_RED_SANDSTONE_RAMP.get(),
CustomBlocks.ITEM_PRISMARINE_RAMP.get(),
CustomBlocks.ITEM_PRISMARINE_BRICKS_RAMP.get(),
CustomBlocks.ITEM_DARK_PRISMARINE_RAMP.get(),
CustomBlocks.ITEM_BLACKSTONE_RAMP.get(),
CustomBlocks.ITEM_POLISHED_BLACKSTONE_RAMP.get(),
CustomBlocks.ITEM_POLISHED_BLACKSTONE_BRICKS_RAMP.get(),
CustomBlocks.ITEM_CHISELED_POLISHED_BLACKSTONE_RAMP.get(),
CustomBlocks.ITEM_NETHERRACK_RAMP.get(),
CustomBlocks.ITEM_NETHER_BRICKS_RAMP.get(),
CustomBlocks.ITEM_CHISELED_NETHER_BRICKS_RAMP.get(),
CustomBlocks.ITEM_ACACIA_RAMP.get(),
CustomBlocks.ITEM_BIRCH_RAMP.get(),
CustomBlocks.ITEM_CRIMSON_RAMP.get(),
CustomBlocks.ITEM_DARK_OAK_RAMP.get(),
CustomBlocks.ITEM_JUNGLE_RAMP.get(),
CustomBlocks.ITEM_OAK_RAMP.get(),
CustomBlocks.ITEM_SPRUCE_RAMP.get(),
CustomBlocks.ITEM_WARPED_RAMP.get(),
CustomBlocks.ITEM_PAVED_ROAD_RAMP.get(),
CustomBlocks.ITEM_PAVED_ROAD_RAMP.get(),
CustomBlocks.ITEM_JAIL_BARS.get(),
CustomBlocks.ITEM_ACACIA_BARRIER.get(),
CustomBlocks.ITEM_BIRCH_BARRIER.get(),
CustomBlocks.ITEM_CRIMSON_BARRIER.get(),
CustomBlocks.ITEM_DARK_OAK_BARRIER.get(),
CustomBlocks.ITEM_OAK_BARRIER.get(),
CustomBlocks.ITEM_SPRUCE_BARRIER.get(),
CustomBlocks.ITEM_WARPED_BARRIER.get(),
CustomBlocks.ITEM_COBBLESTONE_BARRIER.get(),
CustomBlocks.ITEM_STONE_BARRIER.get(),
CustomBlocks.ITEM_STONE_BRICKS_BARRIER.get(),
CustomBlocks.ITEM_CRACKED_STONE_BRICKS_BARRIER.get(),
CustomBlocks.ITEM_MOSSY_STONE_BRICKS_BARRIER.get(),
CustomBlocks.ITEM_CHISELED_STONE_BRICKS_BARRIER.get(),
CustomBlocks.ITEM_CLAY_BARRIER.get(),
CustomBlocks.ITEM_SAND_BARRIER.get(),
CustomBlocks.ITEM_RED_SAND_BARRIER.get(),
CustomBlocks.ITEM_SMOOTH_STONE_BARRIER.get(),
CustomBlocks.ITEM_GRAVEL_BARRIER.get(),
CustomBlocks.ITEM_GRANITE_BARRIER.get(),
CustomBlocks.ITEM_JUNGLE_BARRIER.get(),
CustomBlocks.ITEM_POLISHED_GRANITE_BARRIER.get(),
CustomBlocks.ITEM_DIORITE_BARRIER.get(),
CustomBlocks.ITEM_POLISHED_DIORITE_BARRIER.get(),
CustomBlocks.ITEM_OBSIDIAN_BARRIER.get(),
CustomBlocks.ITEM_ANDESITE_BARRIER.get(),
CustomBlocks.ITEM_POLISHED_ANDESITE_BARRIER.get(),
CustomBlocks.ITEM_MOSSY_COBBLESTONE_BARRIER.get(),
CustomBlocks.ITEM_BRICKS_BARRIER.get(),
CustomBlocks.ITEM_TERRACOTTA_BARRIER.get(),
CustomBlocks.ITEM_SANDSTONE_BARRIER.get(),
CustomBlocks.ITEM_CHISELED_SANDSTONE_BARRIER.get(),
CustomBlocks.ITEM_CUT_SANDSTONE_BARRIER.get(),
CustomBlocks.ITEM_RED_SANDSTONE_BARRIER.get(),
CustomBlocks.ITEM_CHISELED_RED_SANDSTONE_BARRIER.get(),
CustomBlocks.ITEM_CUT_RED_SANDSTONE_BARRIER.get(),
CustomBlocks.ITEM_PRISMARINE_BARRIER.get(),
CustomBlocks.ITEM_PRISMARINE_BRICKS_BARRIER.get(),
CustomBlocks.ITEM_BLACKSTONE_BARRIER.get(),
CustomBlocks.ITEM_POLISHED_BLACKSTONE_BARRIER.get(),
CustomBlocks.ITEM_POLISHED_BLACKSTONE_BRICKS_BARRIER.get(),
CustomBlocks.ITEM_CHISELED_POLISHED_BLACKSTONE_BARRIER.get(),
CustomBlocks.ITEM_NETHERRACK_BARRIER.get(),
CustomBlocks.ITEM_NETHER_BRICKS_BARRIER.get(),
CustomBlocks.ITEM_CHISELED_NETHER_BRICKS_BARRIER.get(),
CustomBlocks.ITEM_VINYL_SIDING.get(),
CustomBlocks.ITEM_RED_VINYL_SIDING.get(),
CustomBlocks.ITEM_GREEN_VINYL_SIDING.get(),
CustomBlocks.ITEM_BLUE_VINYL_SIDING.get(),
CustomBlocks.ITEM_GRAY_VINYL_SIDING.get(),
CustomBlocks.ITEM_FOUR_PANEL_WINDOW.get(),
CustomBlocks.ITEM_SIX_PANEL_WINDOW.get(),
CustomBlocks.ITEM_ACACIA_DECK.get(),
CustomBlocks.ITEM_BIRCH_DECK.get(),
CustomBlocks.ITEM_CRIMSON_DECK.get(),
CustomBlocks.ITEM_DARK_OAK_DECK.get(),
CustomBlocks.ITEM_DARK_OAK_DECK.get(),
CustomBlocks.ITEM_JUNGLE_DECK.get(),
CustomBlocks.ITEM_OAK_DECK.get(),
CustomBlocks.ITEM_SPRUCE_DECK.get(),
CustomBlocks.ITEM_WARPED_DECK.get(),
CustomBlocks.ITEM_FLOOR_MAT.get(),
CustomBlocks.ITEM_LANTERN_POST.get(),
CustomBlocks.ITEM_STREET_LIGHT.get(),
ModItems.WHITE_CONCRETE_BARRIER_ITEM.get(),
ModItems.ORANGE_CONCRETE_BARRIER_ITEM.get(),
ModItems.MAGENTA_CONCRETE_BARRIER_ITEM.get(),
ModItems.LIGHT_BLUE_CONCRETE_BARRIER_ITEM.get(),
ModItems.YELLOW_CONCRETE_BARRIER_ITEM.get(),
ModItems.LIME_CONCRETE_BARRIER_ITEM.get(),
ModItems.PINK_CONCRETE_BARRIER_ITEM.get(),
ModItems.GRAY_CONCRETE_BARRIER_ITEM.get(),
ModItems.LIGHT_GRAY_CONCRETE_BARRIER_ITEM.get(),
ModItems.CYAN_CONCRETE_BARRIER_ITEM.get(),
ModItems.PURPLE_CONCRETE_BARRIER_ITEM.get(),
ModItems.BLUE_CONCRETE_BARRIER_ITEM.get(),
ModItems.BROWN_CONCRETE_BARRIER_ITEM.get(),
ModItems.GREEN_CONCRETE_BARRIER_ITEM.get(),
ModItems.RED_CONCRETE_BARRIER_ITEM.get(),
ModItems.BLACK_CONCRETE_BARRIER_ITEM.get()
);
this.tag(ModTags.Items.SEAT)
.add(
CustomBlocks.ITEM_BLACK_SOFA.get(),
CustomBlocks.ITEM_BLUE_SOFA.get(),
CustomBlocks.ITEM_BROWN_SOFA.get(),
CustomBlocks.ITEM_CYAN_SOFA.get(),
CustomBlocks.ITEM_GRAY_SOFA.get(),
CustomBlocks.ITEM_GREEN_SOFA.get(),
CustomBlocks.ITEM_LIGHT_BLUE_SOFA.get(),
CustomBlocks.ITEM_LIGHT_GRAY_SOFA.get(),
CustomBlocks.ITEM_LIME_SOFA.get(),
CustomBlocks.ITEM_MAGENTA_SOFA.get(),
CustomBlocks.ITEM_ORANGE_SOFA.get(),
CustomBlocks.ITEM_PINK_SOFA.get(),
CustomBlocks.ITEM_PURPLE_SOFA.get(),
CustomBlocks.ITEM_RED_SOFA.get(),
CustomBlocks.ITEM_WHITE_SOFA.get(),
CustomBlocks.ITEM_YELLOW_SOFA.get(),
CustomBlocks.ITEM_ACACIA_MINI_STOOL.get(),
CustomBlocks.ITEM_BIRCH_MINI_STOOL.get(),
CustomBlocks.ITEM_CRIMSON_MINI_STOOL.get(),
CustomBlocks.ITEM_DARK_OAK_MINI_STOOL.get(),
CustomBlocks.ITEM_JUNGLE_MINI_STOOL.get(),
CustomBlocks.ITEM_OAK_MINI_STOOL.get(),
CustomBlocks.ITEM_SPRUCE_MINI_STOOL.get(),
CustomBlocks.ITEM_WARPED_MINI_STOOL.get(),
CustomBlocks.ITEM_ACACIA_CHAIR.get(),
CustomBlocks.ITEM_BIRCH_CHAIR.get(),
CustomBlocks.ITEM_CRIMSON_CHAIR.get(),
CustomBlocks.ITEM_DARK_OAK_CHAIR.get(),
CustomBlocks.ITEM_JUNGLE_CHAIR.get(),
CustomBlocks.ITEM_OAK_CHAIR.get(),
CustomBlocks.ITEM_SPRUCE_CHAIR.get(),
CustomBlocks.ITEM_WARPED_CHAIR.get()
);
this.tag(ModTags.Items.SHELF)
.add(
CustomBlocks.ITEM_MODERN_OAK_BOOKSHELF.get(),
CustomBlocks.ITEM_MODERN_ACACIA_BOOKSHELF.get(),
CustomBlocks.ITEM_MODERN_BIRCH_BOOKSHELF.get(),
CustomBlocks.ITEM_MODERN_DARK_OAK_BOOKSHELF.get(),
CustomBlocks.ITEM_MODERN_CRIMSON_BOOKSHELF.get(),
CustomBlocks.ITEM_MODERN_JUNGLE_BOOKSHELF.get(),
CustomBlocks.ITEM_MODERN_SPRUCE_BOOKSHELF.get(),
CustomBlocks.ITEM_MODERN_WARPED_BOOKSHELF.get(),
CustomBlocks.ITEM_ACACIA_WALL_SHELF.get(),
CustomBlocks.ITEM_BIRCH_WALL_SHELF.get(),
CustomBlocks.ITEM_CRIMSON_WALL_SHELF.get(),
CustomBlocks.ITEM_DARK_OAK_WALL_SHELF.get(),
CustomBlocks.ITEM_JUNGLE_WALL_SHELF.get(),
CustomBlocks.ITEM_OAK_WALL_SHELF.get(),
CustomBlocks.ITEM_SPRUCE_WALL_SHELF.get(),
CustomBlocks.ITEM_WARPED_WALL_SHELF.get(),
CustomBlocks.ITEM_DOUBLE_ACACIA_WALL_SHELF.get(),
CustomBlocks.ITEM_DOUBLE_BIRCH_WALL_SHELF.get(),
CustomBlocks.ITEM_DOUBLE_CRIMSON_WALL_SHELF.get(),
CustomBlocks.ITEM_DOUBLE_DARK_OAK_WALL_SHELF.get(),
CustomBlocks.ITEM_DOUBLE_JUNGLE_WALL_SHELF.get(),
CustomBlocks.ITEM_DOUBLE_OAK_WALL_SHELF.get(),
CustomBlocks.ITEM_DOUBLE_SPRUCE_WALL_SHELF.get(),
CustomBlocks.ITEM_DOUBLE_WARPED_WALL_SHELF.get()
);
this.tag(ModTags.Items.TABLE)
.add(
CustomBlocks.ITEM_ACACIA_ROUND_TABLE.get(),
CustomBlocks.ITEM_BIRCH_ROUND_TABLE.get(),
CustomBlocks.ITEM_BIRCH_ROUND_TABLE.get(),
CustomBlocks.ITEM_DARK_OAK_ROUND_TABLE.get(),
CustomBlocks.ITEM_CRIMSON_ROUND_TABLE.get(),
CustomBlocks.ITEM_OAK_ROUND_TABLE.get(),
CustomBlocks.ITEM_JUNGLE_ROUND_TABLE.get(),
CustomBlocks.ITEM_SPRUCE_ROUND_TABLE.get(),
CustomBlocks.ITEM_WARPED_ROUND_TABLE.get(),
CustomBlocks.ITEM_ACACIA_SMALL_TABLE.get(),
CustomBlocks.ITEM_BIRCH_SMALL_TABLE.get(),
CustomBlocks.ITEM_CRIMSON_SMALL_TABLE.get(),
CustomBlocks.ITEM_DARK_OAK_SMALL_TABLE.get(),
CustomBlocks.ITEM_JUNGLE_SMALL_TABLE.get(),
CustomBlocks.ITEM_OAK_SMALL_TABLE.get(),
CustomBlocks.ITEM_SPRUCE_SMALL_TABLE.get(),
CustomBlocks.ITEM_WARPED_SMALL_TABLE.get(),
CustomBlocks.ITEM_ACACIA_COFFEE_TABLE.get(),
CustomBlocks.ITEM_BIRCH_COFFEE_TABLE.get(),
CustomBlocks.ITEM_CRIMSON_COFFEE_TABLE.get(),
CustomBlocks.ITEM_DARK_OAK_COFFEE_TABLE.get(),
CustomBlocks.ITEM_JUNGLE_COFFEE_TABLE.get(),
CustomBlocks.ITEM_OAK_COFFEE_TABLE.get(),
CustomBlocks.ITEM_SPRUCE_COFFEE_TABLE.get(),
CustomBlocks.ITEM_WARPED_COFFEE_TABLE.get(),
CustomBlocks.ITEM_GLASS_ACACIA_COFFEE_TABLE.get(),
CustomBlocks.ITEM_GLASS_BIRCH_COFFEE_TABLE.get(),
CustomBlocks.ITEM_GLASS_CRIMSON_COFFEE_TABLE.get(),
CustomBlocks.ITEM_GLASS_DARK_OAK_COFFEE_TABLE.get(),
CustomBlocks.ITEM_GLASS_JUNGLE_COFFEE_TABLE.get(),
CustomBlocks.ITEM_GLASS_OAK_COFFEE_TABLE.get(),
CustomBlocks.ITEM_GLASS_SPRUCE_COFFEE_TABLE.get(),
CustomBlocks.ITEM_GLASS_WARPED_COFFEE_TABLE.get(),
CustomBlocks.ITEM_GLASS_SLAB.get(),
CustomBlocks.ITEM_ACACIA_PICNIC_TABLE.get(),
CustomBlocks.ITEM_BIRCH_PICNIC_TABLE.get(),
CustomBlocks.ITEM_CRIMSON_PICNIC_TABLE.get(),
CustomBlocks.ITEM_DARK_OAK_PICNIC_TABLE.get(),
CustomBlocks.ITEM_JUNGLE_PICNIC_TABLE.get(),
CustomBlocks.ITEM_OAK_PICNIC_TABLE.get(),
CustomBlocks.ITEM_SPRUCE_PICNIC_TABLE.get()
);
}
}

24
src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModRecipeProvider.java
View File

@ -1,6 +1,6 @@
package com.r3944realms.modernlifepatch.datagen.provider;
import com.r3944realms.modernlifepatch.content.blocks.ModBlocks;
import com.dairymoose.modernlife.core.CustomBlocks;
import com.r3944realms.modernlifepatch.content.items.ModItems;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.recipes.FinishedRecipe;
@ -10,7 +10,6 @@ import net.minecraft.data.recipes.ShapelessRecipeBuilder;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.crafting.StonecutterRecipe;
import net.minecraftforge.common.Tags;
import org.jetbrains.annotations.NotNull;
@ -23,6 +22,27 @@ public class ModRecipeProvider extends RecipeProvider {
@Override
protected void buildCraftingRecipes(@NotNull Consumer<FinishedRecipe> pFinishedRecipeConsumer) {
ShapelessRecipeBuilder.shapeless(CustomBlocks.ITEM_MAGAZINE.get())
.requires(CustomBlocks.ITEM_BULLET.get(), 4)
.unlockedBy("has_bullet", has(CustomBlocks.ITEM_BULLET.get()))
.save(pFinishedRecipeConsumer, "four_bullet_magazine");
ShapelessRecipeBuilder.shapeless(CustomBlocks.ITEM_EXTENDED_MAGAZINE.get())
.requires(CustomBlocks.ITEM_BULLET.get(), 9)
.unlockedBy("has_bullet", has(CustomBlocks.ITEM_BULLET.get()))
.save(pFinishedRecipeConsumer,"nine_bullet_extended_magazine");
ShapelessRecipeBuilder.shapeless(CustomBlocks.ITEM_BULLET.get())
.requires(Items.COPPER_INGOT)
.requires(Items.GUNPOWDER)
.unlockedBy("has_copper", has(Items.COPPER_INGOT))
.save(pFinishedRecipeConsumer, "bullet");
ShapelessRecipeBuilder.shapeless(CustomBlocks.ITEM_BULLET.get(), 6)
.requires(CustomBlocks.ITEM_BULLET_STRIP.get())
.unlockedBy("has_bullet_strip", has(CustomBlocks.ITEM_BULLET_STRIP.get()))
.save(pFinishedRecipeConsumer, "bullet_2");
ShapelessRecipeBuilder.shapeless(CustomBlocks.ITEM_BULLET_STRIP.get())
.requires(CustomBlocks.ITEM_BULLET.get(), 6)
.unlockedBy("has_bullet", has(CustomBlocks.ITEM_BULLET.get()))
.save(pFinishedRecipeConsumer, "six_bullet_bullet_strip");
ShapelessRecipeBuilder.shapeless(ModItems.MIRROR_ITEM.get(), 1)
.requires(Tags.Items.GLASS_PANES)
.requires(Items.IRON_INGOT)

6
src/main/java/com/r3944realms/modernlifepatch/utils/ShapeUtil.java
View File

@ -7,11 +7,7 @@ import java.util.ArrayList;
import java.util.List;
public final class ShapeUtil {
public static void initializeByNorth(VoxelShape north, VoxelShape east, VoxelShape south, VoxelShape west) {
east = ShapeUtil.RotateVoxelShapeClockwise(north);
south = ShapeUtil.RotateVoxelShapeClockwise(east);
west = ShapeUtil.RotateVoxelShapeClockwise(south);
}
public static VoxelShape RotateVoxelShapeClockwise(VoxelShape in) {
final List<VoxelShape> generatedShapes = new ArrayList<>();
in.forAllBoxes((arg0, arg1, arg2, arg3, arg4, arg5) -> {

17
src/main/resources/data/modernlife/recipes/extended_gun_magazine.json
View File

@ -1,17 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"###",
"###"
],
"key": {
"#": {
"item": "modernlife:bullet"
}
},
"result": {
"item": "modernlife:extended_gun_magazine",
"count": 1
}
}