Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-11 04:22:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.18/dev' into mc1.18/0.5.1

Browse source
This commit is contained in:
simibubi 2023-05-12 22:04:34 +02:00
commit f616220b2c
5 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/generated/resources/.cache/cache
View file

@ -5378,6 +5378,9 @@ ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/b
6b73c57912934d09233ad2966110968a6109f2c9 data/forge/tags/fluids/chocolate.json
391c9b2be5740aea943a8a5fe27eb327e2d973b0 data/forge/tags/fluids/honey.json
d6a4e4fe1204b718010543a28a9b9ec4e0977bd7 data/forge/tags/fluids/tea.json
58a0fbab3425558d993559e10fe14a1797b05eab data/forge/tags/items/armors/boots.json
7973972edb524683ef365bc103fcfcde0858a854 data/forge/tags/items/armors/chestplates.json
615e86e25fc29ead90e0901cdaee9d0ed9b3e4b3 data/forge/tags/items/armors/helmets.json
5af3164b14c92d2d6e235b5d4eebd93cbee37c0a data/forge/tags/items/buckets/honey.json
2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough.json
2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough/wheat.json

6
src/generated/resources/data/forge/tags/items/armors/boots.json Normal file
View file

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

6
src/generated/resources/data/forge/tags/items/armors/chestplates.json Normal file
View file

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

6
src/generated/resources/data/forge/tags/items/armors/helmets.json Normal file
View file

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

12
src/main/java/com/simibubi/create/AllItems.java
View file

@ -228,14 +228,16 @@ public class AllItems {
// wrapped by COPPER_BACKTANK for block placement uses.
// must be registered as of 1.18.2
public static final ItemEntry<BacktankBlockItem> COPPER_BACKTANK_PLACEABLE = REGISTRATE
.item("copper_backtank_placeable", p -> new BacktankBlockItem(AllBlocks.COPPER_BACKTANK.get(), AllItems.COPPER_BACKTANK::get, p))
.item("copper_backtank_placeable",
p -> new BacktankBlockItem(AllBlocks.COPPER_BACKTANK.get(), AllItems.COPPER_BACKTANK::get, p))
.model((c, p) -> p.withExistingParent(c.getName(), p.mcLoc("item/barrier")))
.register();
// wrapped by NETHERITE_BACKTANK for block placement uses.
// must be registered as of 1.18.2
public static final ItemEntry<BacktankBlockItem> NETHERITE_BACKTANK_PLACEABLE = REGISTRATE
.item("netherite_backtank_placeable", p -> new BacktankBlockItem(AllBlocks.NETHERITE_BACKTANK.get(), AllItems.NETHERITE_BACKTANK::get, p))
.item("netherite_backtank_placeable",
p -> new BacktankBlockItem(AllBlocks.NETHERITE_BACKTANK.get(), AllItems.NETHERITE_BACKTANK::get, p))
.model((c, p) -> p.withExistingParent(c.getName(), p.mcLoc("item/barrier")))
.register();
@ -248,6 +250,7 @@ public class AllItems {
COPPER_BACKTANK_PLACEABLE))
.model(AssetLookup.customGenericItemModel("_", "item"))
.tag(AllItemTags.PRESSURIZED_AIR_SOURCES.tag)
.tag(forgeItemTag("armors/chestplates"))
.register(),
NETHERITE_BACKTANK = REGISTRATE
@ -257,6 +260,7 @@ public class AllItems {
.model(AssetLookup.customGenericItemModel("_", "item"))
.properties(p -> p.fireResistant())
.tag(AllItemTags.PRESSURIZED_AIR_SOURCES.tag)
.tag(forgeItemTag("armors/chestplates"))
.register();
public static final ItemEntry<? extends DivingHelmetItem>
@ -265,12 +269,14 @@ public class AllItems {
REGISTRATE
.item("copper_diving_helmet",
p -> new DivingHelmetItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving")))
.tag(forgeItemTag("armors/helmets"))
.register(),
NETHERITE_DIVING_HELMET = REGISTRATE
.item("netherite_diving_helmet",
p -> new DivingHelmetItem(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving")))
.properties(p -> p.fireResistant())
.tag(forgeItemTag("armors/helmets"))
.register();
public static final ItemEntry<? extends DivingBootsItem>
@ -279,12 +285,14 @@ public class AllItems {
REGISTRATE
.item("copper_diving_boots",
p -> new DivingBootsItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving")))
.tag(forgeItemTag("armors/boots"))
.register(),
NETHERITE_DIVING_BOOTS = REGISTRATE
.item("netherite_diving_boots",
p -> new DivingBootsItem(ArmorMaterials.NETHERITE, p, Create.asResource("netherite_diving")))
.properties(p -> p.fireResistant())
.tag(forgeItemTag("armors/boots"))
.register();
public static final ItemEntry<SandPaperItem> SAND_PAPER = REGISTRATE.item("sand_paper", SandPaperItem::new)