tursom/ExtraBotany
1
0
Fork 0
mirror of https://github.com/GoldChick/ExtraBotany.git synced 2026-08-19 08:43:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

v0.1.6

Browse Source
This commit is contained in:
HuTao今天吃什么
2022-09-18 13:23:25 +08:00
parent ba75d6df60
commit 579e1d028a
25 changed files with 207 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
build.gradle
View File

@@ -145,14 +145,22 @@ minecraft {
sourceSets.main.resources { srcDir 'src/generated/resources' }
repositories {
maven { url = "https://maven.theillusivec4.top/" }//curios
maven { url = "https://maven.blamejared.com/" }//patchouli
}
maven { url = "https://maven.theillusivec4.top/" }//curios
maven { url = "https://maven.blamejared.com/" }//patchouli + botania
maven {
url "https://www.cursemaven.com"
content {
includeGroup "curse.maven"
}
}
maven { // SlimeKnights and JEI
name 'DVS1 Maven FS'
url 'https://dvs1.progwml6.com/files/maven'
}
}
dependencies {
// Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
// that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
minecraft 'net.minecraftforge:forge:1.18.2-40.1.51'
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
@@ -161,10 +169,13 @@ dependencies {
compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.2-71.1")
runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.2-71.1")
//Only fg.deobf("vazkii.patchouli:Patchouli:1.18.2-71.1:api") runtimeOnly
compileOnly fg.deobf("vazkii.botania:Botania:1.18.2-432")
runtimeOnly fg.deobf("vazkii.botania:Botania:1.18.2-432")
//Only fg.deobf("vazkii.botania:Botania:1.18.2-432:api") runtimeOnly
//Only fg.deobf("vazkii.patchouli:Patchouli:1.18.2-71.1:api") runtimeOnly
compileOnly fg.deobf("vazkii.botania:Botania:1.18.2-${botania_version}")
runtimeOnly fg.deobf("vazkii.botania:Botania:1.18.2-${botania_version}")
//implementation fg.deobf("slimeknights.mantle:Mantle:1.18.2-${mantle_version}")
//implementation fg.deobf("slimeknights.tconstruct:TConstruct:1.18.2-${tcon_version}")
// Real mod deobf dependency examples - these get remapped to your current mappings
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
// runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency

13
gradle.properties
View File

@@ -1,4 +1,13 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
minecraft_version=1.18.2
botania_version=432
mantle_version=1.9.27
tcon_version=3.5.1.31
# idk why it crashed

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

@@ -1,5 +1,8 @@
e38c09d6078d766db3c3f89a6d142188fa8f001e assets/extrabotany/blockstates/annoying_flower.json
d8037506f382c747b09386ef33f783a89a99ed00 assets/extrabotany/blockstates/bell_flower.json
f8dfea1f2d61b467aa0fa40085e1e9e69e3edfd1 assets/extrabotany/blockstates/block_orichalcos.json
114ea9f9f158ad45dcec45c97361254c5f27e660 assets/extrabotany/blockstates/block_photonium.json
2af7eb36749f44e753fcdecfb2045e696121c63f assets/extrabotany/blockstates/block_shadowium.json
187d0927d4fd5ec74e9817ae34b2649bd09b7e5e assets/extrabotany/blockstates/bloody_enchantress.json
dbc222be6f8a545d188cf3589239de49525e15f5 assets/extrabotany/blockstates/dimension_catalyst.json
4b9c8729dd39973b09bed51459893236bf6d8387 assets/extrabotany/blockstates/edelweiss.json
@@ -25,6 +28,9 @@ a11e55f651479912f38def68d408d3365bff4e6b assets/extrabotany/blockstates/moonligh
1423fcfc65550ac8651c5f92b35d377a6c2c9a61 assets/extrabotany/lang/zh_cn.json
477b72a89fa3546590428dd7d8d4528c711a98dc assets/extrabotany/models/block/annoying_flower.json
2f2803ccc1532c712c13241790c9ec65fb61a97d assets/extrabotany/models/block/bell_flower.json
a559d107783c691b559872c498455ac4ebebb363 assets/extrabotany/models/block/block_orichalcos.json
3bb64b1aea6c83bb607689c62c658fd5cc74424b assets/extrabotany/models/block/block_photonium.json
4d22945996c7a55d6332e678313d0c1bed341481 assets/extrabotany/models/block/block_shadowium.json
2cc688d6536ea214d2c83c83c2cf9be55b342b23 assets/extrabotany/models/block/bloody_enchantress.json
995e10c99d5a5c5584b83dda81aa09af163109ee assets/extrabotany/models/block/dimension_catalyst.json
90452cce7b03c4b0a98af9e5f3addd48280a99af assets/extrabotany/models/block/edelweiss.json
@@ -53,6 +59,9 @@ c1df0e3dd8ccbce630506090246e788d4c075b28 assets/extrabotany/models/item/annoying
ce9d0b57aaff584121eef5c525771e936da6bc40 assets/extrabotany/models/item/aqua_stone.json
6ec8d3ee74f27f7798f3c7ebc247f31b5679c237 assets/extrabotany/models/item/bell_flower.json
5c09997da2ae1895c76bd06cdd303b1e621383f7 assets/extrabotany/models/item/black_glasses.json
45ddfb7f9b6159b22984f31090b49bfb492d13a5 assets/extrabotany/models/item/block_orichalcos.json
6ab67c2defe11204a2b6727d293e93edbf0c2fe6 assets/extrabotany/models/item/block_photonium.json
b7698a946e51526de1103ea7a1b6c6eb6bf87aca assets/extrabotany/models/item/block_shadowium.json
0abc9325d35dc2fa3014f999f6969465e15346dc assets/extrabotany/models/item/bloody_enchantress.json
2dd605a4de62ae8913a9b2f6068d990030e59f42 assets/extrabotany/models/item/buddhistrelics.json
a3932fb43699db3c559fe188226cdf95a9865985 assets/extrabotany/models/item/camera.json
@@ -170,7 +179,7 @@ e24955f0e3e0924ca0570a81ee2998680679b5ea data/botania/tags/blocks/special_floati
c9ff3b120bf0d1145a5f6e82846b8f449c734da9 data/botania/tags/items/functional_special_flowers.json
ddc834a139f949eccb001070727eabd4ff1ee8ce data/botania/tags/items/generating_special_flowers.json
fdd7219319bd75a5c113c12c6ca07dace05ce9a4 data/botania/tags/items/lens.json
9191360e9e14f79f88c74632fd0bd22cc50a3310 data/botania/tags/items/mana_using_items.json
c86e8f05abc5ff0cf0661c602039468343a96c8d data/botania/tags/items/mana_using_items.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/botania/tags/items/mini_flowers.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/botania/tags/items/misc_special_flowers.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/botania/tags/items/mundane_floating_flowers.json
@@ -194,6 +203,7 @@ fdd7219319bd75a5c113c12c6ca07dace05ce9a4 data/botania/tags/items/lens.json
6574d25d30d63ccbce291b3a563ab57b3a10b3e6 data/botania/tags/items/runes.json
e24955f0e3e0924ca0570a81ee2998680679b5ea data/botania/tags/items/special_floating_flowers.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/botania/tags/items/special_flowers.json
0bcd8009b859504f81d3490e4176ba911681a065 data/botania/tags/items/terra_pick_blacklist.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/curios/tags/items/belt.json
0680ecd3228a93ce457bfe3a4c92a204c5ec8975 data/curios/tags/items/body.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/curios/tags/items/charm.json
@@ -425,5 +435,7 @@ c009258fcea4ecdb1809a3c0473bc912b1d4584e data/minecraft/recipes/ticket.json
1f5c7755cf336d84f8eac96e5395b94bcc14af7a data/minecraft/recipes/true_terra_blade.json
b22e057a03ce6224445c201b4a1622fccc8224b8 data/minecraft/recipes/true_thunstar_caller.json
b877909a114200579325eb574d323f88c1f4c832 data/minecraft/recipes/universal_petal.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/blocks/mineable/pickaxe.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/blocks/needs_diamond_tool.json
e0fab4d0e45d89968045736e83f785b55f58c4ca data/minecraft/tags/blocks/beacon_base_blocks.json
e0fab4d0e45d89968045736e83f785b55f58c4ca data/minecraft/tags/blocks/mineable/pickaxe.json
1adaa9df3557d91bf0555edc70fcf18e3ac4fedf data/minecraft/tags/blocks/needs_diamond_tool.json
de8b606f5da6abd49836e25ac567060ee65219cd data/minecraft/tags/blocks/needs_iron_tool.json

7
src/generated/resources/assets/extrabotany/blockstates/block_orichalcos.json Normal file
View File

@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "extrabotany:block/block_orichalcos"
}
}
}

7
src/generated/resources/assets/extrabotany/blockstates/block_photonium.json Normal file
View File

@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "extrabotany:block/block_photonium"
}
}
}

7
src/generated/resources/assets/extrabotany/blockstates/block_shadowium.json Normal file
View File

@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "extrabotany:block/block_shadowium"
}
}
}

6
src/generated/resources/assets/extrabotany/models/block/block_orichalcos.json Normal file
View File

@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "extrabotany:block/block_orichalcos"
}
}

6
src/generated/resources/assets/extrabotany/models/block/block_photonium.json Normal file
View File

@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "extrabotany:block/block_photonium"
}
}

6
src/generated/resources/assets/extrabotany/models/block/block_shadowium.json Normal file
View File

@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "extrabotany:block/block_shadowium"
}
}

3
src/generated/resources/assets/extrabotany/models/item/block_orichalcos.json Normal file
View File

@@ -0,0 +1,3 @@
{
"parent": "extrabotany:block/block_orichalcos"
}

3
src/generated/resources/assets/extrabotany/models/item/block_photonium.json Normal file
View File

@@ -0,0 +1,3 @@
{
"parent": "extrabotany:block/block_photonium"
}

3
src/generated/resources/assets/extrabotany/models/item/block_shadowium.json Normal file
View File

@@ -0,0 +1,3 @@
{
"parent": "extrabotany:block/block_shadowium"
}

6
src/generated/resources/data/botania/tags/items/mana_using_items.json
View File

@@ -20,6 +20,10 @@
"extrabotany:miku_helm",
"extrabotany:miku_chest",
"extrabotany:miku_legs",
"extrabotany:miku_boots"
"extrabotany:miku_boots",
"extrabotany:maid_helm",
"extrabotany:maid_chest",
"extrabotany:maid_legs",
"extrabotany:maid_boots"
]
}

6
src/generated/resources/data/botania/tags/items/terra_pick_blacklist.json Normal file
View File

@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"extrabotany:maid_helm"
]
}

8
src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json Normal file
View File

@@ -0,0 +1,8 @@
{
"replace": false,
"values": [
"extrabotany:block_photonium",
"extrabotany:block_shadowium",
"extrabotany:block_orichalcos"
]
}

6
src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
View File

@@ -1,4 +1,8 @@
{
"replace": false,
"values": []
"values": [
"extrabotany:block_photonium",
"extrabotany:block_shadowium",
"extrabotany:block_orichalcos"
]
}

4
src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
View File

@@ -1,4 +1,6 @@
{
"replace": false,
"values": []
"values": [
"extrabotany:block_orichalcos"
]
}

7
src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json Normal file
View File

@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"extrabotany:block_photonium",
"extrabotany:block_shadowium"
]
}

9
src/main/java/chick/extrabotany/common/ModBlocks.java
View File

@@ -12,6 +12,8 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import java.util.List;
import static chick.extrabotany.ExtraBotany.MODID;
import static net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer;
@@ -27,6 +29,13 @@ public class ModBlocks
public static final RegistryObject<Block> DIMENSION_CATALYST = BLOCKS.register(LibBlockNames.DIMENSION_CATALYST, () -> new DimensionCatalyst(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(1f, 4f)));
public static final RegistryObject<Item> DIMENSION_CATALYST_ITEM = fromBlock(DIMENSION_CATALYST);
public static final RegistryObject<Block> BLOCK_PHOTONIUM = BLOCKS.register(LibBlockNames.BLOCK_PHOTONIUM, () -> new DimensionCatalyst(BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().strength(2f, 8f)));
public static final RegistryObject<Item> BLOCK_PHOTONIUM_ITEM = fromBlock(BLOCK_PHOTONIUM);
public static final RegistryObject<Block> BLOCK_SHADOWIUM = BLOCKS.register(LibBlockNames.BLOCK_SHADOWIUM, () -> new DimensionCatalyst(BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().strength(2f, 8f)));
public static final RegistryObject<Item> BLOCK_SHADOWIUM_ITEM = fromBlock(BLOCK_SHADOWIUM);
public static final RegistryObject<Block> BLOCK_ORICHALCOS = BLOCKS.register(LibBlockNames.BLOCK_ORICHALCOS, () -> new DimensionCatalyst(BlockBehaviour.Properties.of(Material.HEAVY_METAL).requiresCorrectToolForDrops().strength(4f, 12f)));
public static final RegistryObject<Item> BLOCK_ORICHALCOS_ITEM = fromBlock(BLOCK_ORICHALCOS);
//public static final TagKey<Block> _YLG_ORE = TagKey.create(Registry.BLOCK_REGISTRY, new ResourceLocation(MODID, "yeluogui_ore"));
//public static final TagKey<Item> _YLG_ORE_ITEM = TagKey.create(Registry.ITEM_REGISTRY, new ResourceLocation(MODID, "yeluogui_ore"));

3
src/main/java/chick/extrabotany/common/libs/LibBlockNames.java
View File

@@ -3,6 +3,9 @@ package chick.extrabotany.common.libs;
public class LibBlockNames
{
public static String DIMENSION_CATALYST = "dimension_catalyst";
public static String BLOCK_ORICHALCOS = "block_orichalcos";
public static String BLOCK_PHOTONIUM = "block_photonium";
public static String BLOCK_SHADOWIUM = "block_shadowium";
//no other Block Entity Types should start with this!
//or forge.client.EntityRenderer will crash!

9
src/main/java/chick/extrabotany/common/tools/armors/ArmorBase.java
View File

@@ -37,6 +37,15 @@ public abstract class ArmorBase extends ArmorItem implements IPhantomInkable, IM
this.armorTexture = armorTexture;
}
@Override
public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, boolean selected)
{
if (entity instanceof Player player)
{
onArmorTick(stack, level, player);
}
}
@SoftImplement("IForgeItem")
public void onArmorTick(ItemStack stack, Level level, Player player)
{

16
src/main/java/chick/extrabotany/datagen/ModBlockStates.java
View File

@@ -27,17 +27,21 @@ public class ModBlockStates extends BlockStateProvider
protected void registerStatesAndModels()
{
//transparent rendertype in class ForgeClientInitializer
simpleBlock(ModBlocks.DIMENSION_CATALYST.get());
//just create json for floating flower!
var stream = Registry.BLOCK.stream().filter(b -> b.getRegistryName().getNamespace().equals(ExtraBotany.MODID));
stream.forEach(flower ->
stream.forEach(block ->
{
if (flower instanceof BlockSpecialFlower)
if (block instanceof BlockSpecialFlower)
{
simpleFlowerTexture(flower);
} else if (flower instanceof BlockFloatingSpecialFlower)
simpleFlowerTexture(block);
} else if (block instanceof BlockFloatingSpecialFlower)
{
simpleFloatingFlowerTexture(flower);
simpleFloatingFlowerTexture(block);
} else //simple block
{
simpleBlock(block);
}
});
}

21
src/main/java/chick/extrabotany/datagen/ModBlockTags.java
View File

@@ -1,6 +1,7 @@
package chick.extrabotany.datagen;
import chick.extrabotany.ExtraBotany;
import chick.extrabotany.common.ModBlocks;
import chick.extrabotany.common.blocks.ModSubtiles;
import net.minecraft.core.Registry;
import net.minecraft.data.DataGenerator;
@@ -9,6 +10,7 @@ import net.minecraft.tags.BlockTags;
import net.minecraft.world.level.block.Block;
import net.minecraftforge.common.Tags;
import net.minecraftforge.common.data.ExistingFileHelper;
import org.jetbrains.annotations.NotNull;
import vazkii.botania.common.block.BlockFloatingSpecialFlower;
import vazkii.botania.common.lib.ModTags;
@@ -28,11 +30,23 @@ public class ModBlockTags extends BlockTagsProvider
@Override
protected void addTags()
{
tag(BlockTags.NEEDS_DIAMOND_TOOL)
tag(BlockTags.NEEDS_IRON_TOOL)
.add(ModBlocks.BLOCK_PHOTONIUM.get())
.add(ModBlocks.BLOCK_SHADOWIUM.get())
;
tag(BlockTags.NEEDS_DIAMOND_TOOL)
.add(ModBlocks.BLOCK_ORICHALCOS.get())
;
tag(BlockTags.MINEABLE_WITH_PICKAXE)
.add(ModBlocks.BLOCK_PHOTONIUM.get())
.add(ModBlocks.BLOCK_SHADOWIUM.get())
.add(ModBlocks.BLOCK_ORICHALCOS.get())
;
tag(BlockTags.BEACON_BASE_BLOCKS)
.add(ModBlocks.BLOCK_PHOTONIUM.get())
.add(ModBlocks.BLOCK_SHADOWIUM.get())
.add(ModBlocks.BLOCK_ORICHALCOS.get())
;
tag(Tags.Blocks.ORES)
@@ -59,8 +73,9 @@ public class ModBlockTags extends BlockTagsProvider
;
}
@Override
public String getName()
public @NotNull String getName()
{
return "extrabotany Block Tags";
}

56
src/main/java/chick/extrabotany/datagen/ModItemModels.java
View File

@@ -9,16 +9,14 @@ import chick.extrabotany.common.libs.LibItemNames;
import net.minecraft.core.Registry;
import net.minecraft.data.DataGenerator;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.BowItem;
import net.minecraft.world.item.ProjectileWeaponItem;
import net.minecraft.world.item.ShieldItem;
import net.minecraft.world.item.SwordItem;
import net.minecraft.world.item.*;
import net.minecraftforge.client.model.generators.ItemModelBuilder;
import net.minecraftforge.client.model.generators.ItemModelProvider;
import net.minecraftforge.common.data.ExistingFileHelper;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import java.util.ArrayList;
import java.util.stream.Stream;
public class ModItemModels extends ItemModelProvider
@@ -31,15 +29,13 @@ public class ModItemModels extends ItemModelProvider
@Override
protected void registerModels()
{
var list = new ArrayList<>(Registry.ITEM.stream()
.filter(p -> p.getRegistryName().getNamespace().equals(ExtraBotany.MODID))
.filter(p -> !(p instanceof ItemBlockSpecialFlower))
.filter(p -> !(p instanceof BlockItem))
.filter(p -> !(p instanceof ShieldItem))
.filter(p -> !(p instanceof SwordItem))
.filter(p -> !(p instanceof ProjectileWeaponItem))
.toList());
list.remove(ModBlocks.DIMENSION_CATALYST_ITEM.get());
//write in ModItemOverrideModel
list.remove(ModItems.COCK_TAIL.get());
//write by hand
@@ -61,36 +57,24 @@ public class ModItemModels extends ItemModelProvider
private void registerFlowerModels()
{
withExistingParent(ModBlocks.DIMENSION_CATALYST_ITEM.get().getRegistryName().getPath(), modLoc("block/" + LibBlockNames.DIMENSION_CATALYST));
//no floating flowers here
//generating
Registry.ITEM.stream().filter(p -> p.getRegistryName().getNamespace().equals(ExtraBotany.MODID))
.forEach(b ->
{
var path = b.getRegistryName().getPath();
if (b instanceof ItemBlockSpecialFlower)//this extends BlockItem
{
//no floating flowers here
if (!path.startsWith("floating_"))
{
singleTexture(path, mcLoc("item/generated"), "layer0", modLoc("block/" + path));
}
} else if (b instanceof BlockItem)
{
withExistingParent(path, modLoc("block/" + path));
}
}
);
var list = new ArrayList<>(Registry.ITEM.stream()
.filter(p -> p.getRegistryName().getNamespace().equals(ExtraBotany.MODID))
.filter(p -> (p instanceof ItemBlockSpecialFlower))
.toList());
for (var item : list)
{
var path = item.getRegistryName().getPath();
if (!path.startsWith("floating_"))
{
singleTexture(path, mcLoc("item/generated"), "layer0", modLoc("block/" + path));
}
}
/*
singleTexture(ModSubtiles.sunshinelily_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.SUNSHINE_LILY));
singleTexture(ModSubtiles.moonlightlily_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.MOONLIGHT_LILY));
singleTexture(ModSubtiles.omniviolet_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.OMNI_VIOLET));
singleTexture(ModSubtiles.geminiorchid_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.GEMINI_ORCHID));
singleTexture(ModSubtiles.bellflower_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.BELL_FLOWER));
singleTexture(ModSubtiles.reikarorchid_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.REIKAR_ORCHID));
singleTexture(ModSubtiles.bloodyenchantress_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.BLOODY_ENCHANTRESS));
singleTexture(ModSubtiles.edelweiss_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.EDELWEISS));
singleTexture(ModSubtiles.tinkleflower_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.TINKLE_FLOWER));
//functional
singleTexture(ModSubtiles.serenitian_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.SERENITIAN));
singleTexture(ModSubtiles.annoying_item.getRegistryName().getPath(), mcLoc("item/generated"), "layer0", modLoc("block/" + LibBlockNames.ANNOYING_FLOWER));
*/
}
private void registerWeaponModels()

25
src/main/java/chick/extrabotany/datagen/ModItemTags.java
View File

@@ -5,14 +5,13 @@ import net.minecraft.data.DataGenerator;
import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraft.data.tags.ItemTagsProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraftforge.common.Tags;
import net.minecraftforge.common.data.ExistingFileHelper;
import org.jetbrains.annotations.NotNull;
import vazkii.botania.common.lib.ModTags;
import static chick.extrabotany.ExtraBotany.MODID;
@@ -64,7 +63,9 @@ public class ModItemTags extends ItemTagsProvider
tag(ModTags.Items.RODS)
.add(ModItems.ROD_OF_DISCORD.get())
;
tag(ModTags.Items.TERRA_PICK_BLACKLIST)
.add(ModItems.MAID_HELM.get())
;
tag(ModTags.Items.MANA_USING_ITEMS)
.add(ModItems.ROD_OF_DISCORD.get())
.add(ModItems.SHADOW_KATANA.get())
@@ -75,18 +76,10 @@ public class ModItemTags extends ItemTagsProvider
.add(ModItems.FIRST_FRACTAL.get())
.add(ModItems.FAILNAUGHT.get())
.add(ModItems.SHADOW_WARRIOR_HELM.get())
.add(ModItems.SHADOW_WARRIOR_CHEST.get())
.add(ModItems.SHADOW_WARRIOR_LEGS.get())
.add(ModItems.SHADOW_WARRIOR_BOOTS.get())
.add(ModItems.GOBLINSLAYER_HELM.get())
.add(ModItems.GOBLINSLAYER_CHEST.get())
.add(ModItems.GOBLINSLAYER_LEGS.get())
.add(ModItems.GOBLINSLAYER_BOOTS.get())
.add(ModItems.MIKU_HELM.get())
.add(ModItems.MIKU_CHEST.get())
.add(ModItems.MIKU_LEGS.get())
.add(ModItems.MIKU_BOOTS.get())
.add(ModItems.SHADOW_WARRIOR_HELM.get(), ModItems.SHADOW_WARRIOR_CHEST.get(), ModItems.SHADOW_WARRIOR_LEGS.get(), ModItems.SHADOW_WARRIOR_BOOTS.get())
.add(ModItems.GOBLINSLAYER_HELM.get(), ModItems.GOBLINSLAYER_CHEST.get(), ModItems.GOBLINSLAYER_LEGS.get(), ModItems.GOBLINSLAYER_BOOTS.get())
.add(ModItems.MIKU_HELM.get(), ModItems.MIKU_CHEST.get(), ModItems.MIKU_LEGS.get(), ModItems.MIKU_BOOTS.get())
.add(ModItems.MAID_HELM.get(), ModItems.MAID_CHEST.get(), ModItems.MAID_LEGS.get(), ModItems.MAID_BOOTS.get())
;
baublesTags();
}
@@ -137,7 +130,7 @@ public class ModItemTags extends ItemTagsProvider
}
@Override
public String getName()
public @NotNull String getName()
{
return "extrabotany Item Tags";
}