Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-14 17:43:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Too Intrusive

Browse source 
- Fixed unregistered holders in the item registry
This commit is contained in:
simibubi 2022-03-22 19:11:08 +01:00
parent 2fa65727d5
commit 1525cbb14b
19 changed files with 83 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -530,22 +530,22 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo
6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
64a8442735a333c7444cac12cfb22c454ca06b6b assets/create/lang/en_ud.json
3025898bb663b49ed550213a215cef18b0088e0a assets/create/lang/en_us.json
8c61dfd075c622ae55e357356e892c5beee2c3aa assets/create/lang/unfinished/de_de.json
a8b0d479a7817127bc52569167f32378e11420ce assets/create/lang/unfinished/es_cl.json
2dde88b654172a69c9f68eb54584e7f68c8600fc assets/create/lang/unfinished/es_es.json
88a8d4a8658ff96b778112769c2b9f8ee1af12f6 assets/create/lang/unfinished/fr_fr.json
42281c85374f9583bfb714cc2a634bf59e5cec19 assets/create/lang/unfinished/it_it.json
0ca86935c39301220f609bdf5145b34b55bdd6bd assets/create/lang/unfinished/ja_jp.json
eafcb60d35104abe3453542628772d32ac631e33 assets/create/lang/unfinished/ko_kr.json
99775dd562ee0457f39b54f5d850c1bc6529a840 assets/create/lang/unfinished/nl_nl.json
c3f46417c4b5e3c0a83f5a1affcf21ecd2d4694f assets/create/lang/unfinished/pl_pl.json
6b09310200f780020965bcd5db768d28081efcf5 assets/create/lang/unfinished/pt_br.json
cfcfc82ad5b307b7395f66057dbda849e70c08f9 assets/create/lang/unfinished/pt_pt.json
34f8b480a8af8e449a3dfb8c978bbceeb934824f assets/create/lang/unfinished/ru_ru.json
396ff04a12796b38deb0697e36f970c75db814e6 assets/create/lang/unfinished/zh_cn.json
1116935a6b993de72ec7e15a8f44d06a7de3ebe7 assets/create/lang/unfinished/zh_tw.json
7880ce16e8b649e26d01cecee271648027f26651 assets/create/lang/en_ud.json
aca02d2ab91e288e65e07470a117ace325299130 assets/create/lang/en_us.json
64aa458040affc16c4412297cdb5ee13ad010660 assets/create/lang/unfinished/de_de.json
7f36bcf491d6890a563c8d03c281e300576f446d assets/create/lang/unfinished/es_cl.json
0c44dc2a7f3157c463a26900ec75b0278b372cc9 assets/create/lang/unfinished/es_es.json
ee7d298b7234ba25b373eb9d9f2a3ec52aeca233 assets/create/lang/unfinished/fr_fr.json
e642827b0c2530c490f6a4961cba9f6d91d3783c assets/create/lang/unfinished/it_it.json
e92011006f03ed066b51eb5d03011a982589ff37 assets/create/lang/unfinished/ja_jp.json
6441efd98496beff0dcfbd15fd1dd20f5e26eaaf assets/create/lang/unfinished/ko_kr.json
2313eaab1f7eabd4d6d481c139e3fe84ebb4a1eb assets/create/lang/unfinished/nl_nl.json
5a35cb79c97578730d20f766a59443afe484ad03 assets/create/lang/unfinished/pl_pl.json
1112631bcb7d1503dec6e605ef1c4828a1726551 assets/create/lang/unfinished/pt_br.json
36b1368644fb946a97044610932e2a11ddf508b3 assets/create/lang/unfinished/pt_pt.json
8ffe7f27cd6fce29116f9e0920c792376545aa2c assets/create/lang/unfinished/ru_ru.json
967dd607e8784ad7d8851c18f89e32661543a394 assets/create/lang/unfinished/zh_cn.json
5cd389eba3817fc4d5cbaa0ce15ccdb7fbe6c0bf assets/create/lang/unfinished/zh_tw.json
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json

1
src/generated/resources/assets/create/lang/en_ud.json
View file

@ -559,6 +559,7 @@
"item.create.chromatic_compound": "punod\u026Fo\u0186 \u0254\u0131\u0287\u0250\u026Fo\u0279\u0265\u0186",
"item.create.cinder_flour": "\u0279no\u05DF\u2132 \u0279\u01DDpu\u0131\u0186",
"item.create.copper_backtank": "\u029Eu\u0250\u0287\u029E\u0254\u0250\u15FA \u0279\u01DDddo\u0186",
"item.create.copper_backtank_placeable": "\u01DD\u05DFq\u0250\u01DD\u0254\u0250\u05DF\u0500 \u029Eu\u0250\u0287\u029E\u0254\u0250\u15FA \u0279\u01DDddo\u0186",
"item.create.copper_nugget": "\u0287\u01DDbbnN \u0279\u01DDddo\u0186",
"item.create.copper_sheet": "\u0287\u01DD\u01DD\u0265S \u0279\u01DDddo\u0186",
"item.create.crafter_slot_cover": "\u0279\u01DD\u028Co\u0186 \u0287o\u05DFS \u0279\u01DD\u0287\u025F\u0250\u0279\u0186",

1
src/generated/resources/assets/create/lang/en_us.json
View file

@ -566,6 +566,7 @@
"item.create.chromatic_compound": "Chromatic Compound",
"item.create.cinder_flour": "Cinder Flour",
"item.create.copper_backtank": "Copper Backtank",
"item.create.copper_backtank_placeable": "Copper Backtank Placeable",
"item.create.copper_nugget": "Copper Nugget",
"item.create.copper_sheet": "Copper Sheet",
"item.create.crafter_slot_cover": "Crafter Slot Cover",

3
src/generated/resources/assets/create/lang/unfinished/de_de.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1323",
"_": "Missing Localizations: 1324",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "Chromatische Verbindung",
"item.create.cinder_flour": "Aschenmehl",
"item.create.copper_backtank": "UNLOCALIZED: Copper Backtank",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "Kupferklumpen",
"item.create.copper_sheet": "Kupferblech",
"item.create.crafter_slot_cover": "Handwerkseinheit Slot Abdeckung",

3
src/generated/resources/assets/create/lang/unfinished/es_cl.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 334",
"_": "Missing Localizations: 335",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "Compuesto Cromático",
"item.create.cinder_flour": "Harina de Cenizas",
"item.create.copper_backtank": "Mochila-Tanque de Cobre",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "Nugget de Cobre",
"item.create.copper_sheet": "Plancha de Cobre",
"item.create.crafter_slot_cover": "Cubre Ranuras",

3
src/generated/resources/assets/create/lang/unfinished/es_es.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 5",
"_": "Missing Localizations: 6",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "Compuesto cromático",
"item.create.cinder_flour": "Harina del Nether",
"item.create.copper_backtank": "Depósito trasero de cobre",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "Pepita de cobre",
"item.create.copper_sheet": "Lámina de cobre",
"item.create.crafter_slot_cover": "Tapa de ranura del ensamblador mecánico",

3
src/generated/resources/assets/create/lang/unfinished/fr_fr.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1585",
"_": "Missing Localizations: 1586",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "Composé chromatique",
"item.create.cinder_flour": "Farine de braise",
"item.create.copper_backtank": "UNLOCALIZED: Copper Backtank",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "Pépite de cuivre",
"item.create.copper_sheet": "Plaques de cuivre",
"item.create.crafter_slot_cover": "Couvercle",

3
src/generated/resources/assets/create/lang/unfinished/it_it.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1274",
"_": "Missing Localizations: 1275",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "Composto cromatico",
"item.create.cinder_flour": "Cenere farinosa",
"item.create.copper_backtank": "UNLOCALIZED: Copper Backtank",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "Pepita di rame",
"item.create.copper_sheet": "Lamiera di rame",
"item.create.crafter_slot_cover": "Rivestimento per slot da costruzione",

3
src/generated/resources/assets/create/lang/unfinished/ja_jp.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 0",
"_": "Missing Localizations: 1",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "色彩の化合物",
"item.create.cinder_flour": "ネザーラックの粉",
"item.create.copper_backtank": "銅のバックタンク",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "銅塊",
"item.create.copper_sheet": "銅板",
"item.create.crafter_slot_cover": "クラフタースロットカバー",

3
src/generated/resources/assets/create/lang/unfinished/ko_kr.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 0",
"_": "Missing Localizations: 1",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "색채 혼합물",
"item.create.cinder_flour": "잿가루",
"item.create.copper_backtank": "구리 산소통",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "구리 조각",
"item.create.copper_sheet": "구리 판",
"item.create.crafter_slot_cover": "조합기 슬롯 덮개",

3
src/generated/resources/assets/create/lang/unfinished/nl_nl.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1938",
"_": "Missing Localizations: 1939",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound",
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
"item.create.copper_backtank": "UNLOCALIZED: Copper Backtank",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "Koper klompje",
"item.create.copper_sheet": "UNLOCALIZED: Copper Sheet",
"item.create.crafter_slot_cover": "UNLOCALIZED: Crafter Slot Cover",

3
src/generated/resources/assets/create/lang/unfinished/pl_pl.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 373",
"_": "Missing Localizations: 374",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "Związek chromatyczny",
"item.create.cinder_flour": "Rozżarzona mąka",
"item.create.copper_backtank": "Miedziany zbiornik w plecaku",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "Bryłka miedzi",
"item.create.copper_sheet": "Arkusz miedzi",
"item.create.crafter_slot_cover": "Przykrywka na slot stołu rzemieślniczego",

3
src/generated/resources/assets/create/lang/unfinished/pt_br.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1185",
"_": "Missing Localizations: 1186",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "Composto Cromático",
"item.create.cinder_flour": "Farinha de Netherrack",
"item.create.copper_backtank": "Tanque Traseiro",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "Pepita de Cobre",
"item.create.copper_sheet": "Chapa de Cobre",
"item.create.crafter_slot_cover": "Cobertura do slot de fabricador",

3
src/generated/resources/assets/create/lang/unfinished/pt_pt.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1557",
"_": "Missing Localizations: 1558",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "Composto Cromático",
"item.create.cinder_flour": "Farinha de Netherrack",
"item.create.copper_backtank": "Tanque Traseiro",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "Pepita de Cobre",
"item.create.copper_sheet": "Chapa de Cobre",
"item.create.crafter_slot_cover": "Cobertura do slot de fabricador",

3
src/generated/resources/assets/create/lang/unfinished/ru_ru.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 378",
"_": "Missing Localizations: 379",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "Хроматический компаунд",
"item.create.cinder_flour": "Незераковая пыль",
"item.create.copper_backtank": "Медный баллон",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "Кусочек меди",
"item.create.copper_sheet": "Медный лист",
"item.create.crafter_slot_cover": "Крышка на слот крафтера",

3
src/generated/resources/assets/create/lang/unfinished/zh_cn.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 0",
"_": "Missing Localizations: 1",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "异彩化合物",
"item.create.cinder_flour": "下界面粉",
"item.create.copper_backtank": "铜制背罐",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "铜粒",
"item.create.copper_sheet": "铜板",
"item.create.crafter_slot_cover": "合成器盖板",

3
src/generated/resources/assets/create/lang/unfinished/zh_tw.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 392",
"_": "Missing Localizations: 393",
"_": "->------------------------] Game Elements [------------------------<-",
@ -567,6 +567,7 @@
"item.create.chromatic_compound": "異彩化合物",
"item.create.cinder_flour": "地獄麵粉",
"item.create.copper_backtank": "銅製後背包",
"item.create.copper_backtank_placeable": "UNLOCALIZED: Copper Backtank Placeable",
"item.create.copper_nugget": "銅粒",
"item.create.copper_sheet": "銅板",
"item.create.crafter_slot_cover": "合成器蓋板",

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

@ -40,6 +40,7 @@ import com.simibubi.create.content.curiosities.ShadowSteelItem;
import com.simibubi.create.content.curiosities.TreeFertilizerItem;
import com.simibubi.create.content.curiosities.armor.CopperArmorItem;
import com.simibubi.create.content.curiosities.armor.CopperBacktankItem;
import com.simibubi.create.content.curiosities.armor.CopperBacktankItem.CopperBacktankBlockItem;
import com.simibubi.create.content.curiosities.armor.DivingBootsItem;
import com.simibubi.create.content.curiosities.armor.DivingHelmetItem;
import com.simibubi.create.content.curiosities.symmetry.SymmetryWandItem;
@ -63,7 +64,6 @@ import com.tterrag.registrate.util.entry.ItemEntry;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.food.FoodProperties;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Rarity;
import net.minecraftforge.common.Tags;
@ -243,13 +243,18 @@ public class AllItems {
REGISTRATE.item("crafting_blueprint", BlueprintItem::new)
.register();
// wrapped by COPPER_BACKTANK for block placement uses.
// must be registered as of 1.18.2
public static final ItemEntry<CopperBacktankBlockItem> COPPER_BACKTANK_PLACEABLE = REGISTRATE
.item("copper_backtank_placeable", p -> new CopperBacktankBlockItem(AllBlocks.COPPER_BACKTANK.get(), p))
.model((c, p) -> p.getExistingFile(p.mcLoc("item/barrier")))
.register();
public static final ItemEntry<? extends CopperArmorItem>
COPPER_BACKTANK =
REGISTRATE
.item("copper_backtank", p -> new CopperBacktankItem(p, new BlockItem(AllBlocks.COPPER_BACKTANK.get(), p)))
.model(AssetLookup.<CopperBacktankItem>customGenericItemModel("_", "item"))
.register(),
COPPER_BACKTANK = REGISTRATE.item("copper_backtank", p -> new CopperBacktankItem(p, COPPER_BACKTANK_PLACEABLE))
.model(AssetLookup.<CopperBacktankItem>customGenericItemModel("_", "item"))
.register(),
DIVING_HELMET = REGISTRATE.item("diving_helmet", DivingHelmetItem::new)
.register(),

33
src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankItem.java
View file

@ -1,6 +1,7 @@
package com.simibubi.create.content.curiosities.armor;
import com.simibubi.create.content.curiosities.armor.CapacityEnchantment.ICapacityEnchantable;
import com.tterrag.registrate.util.entry.ItemEntry;
import net.minecraft.core.NonNullList;
import net.minecraft.nbt.CompoundTag;
@ -11,27 +12,29 @@ import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.block.Block;
public class CopperBacktankItem extends CopperArmorItem implements ICapacityEnchantable {
public static final int DURABILITY_BAR = 0xEFEFEF;
private BlockItem blockItem;
private ItemEntry<CopperBacktankBlockItem> blockItem;
public CopperBacktankItem(Properties p_i48534_3_, BlockItem blockItem) {
public CopperBacktankItem(Properties p_i48534_3_, ItemEntry<CopperBacktankBlockItem> copperBacktankPlaceable) {
super(EquipmentSlot.CHEST, p_i48534_3_);
this.blockItem = blockItem;
this.blockItem = copperBacktankPlaceable;
}
@Override
public InteractionResult useOn(UseOnContext p_195939_1_) {
return blockItem.useOn(p_195939_1_);
return blockItem.get()
.useOn(p_195939_1_);
}
@Override
public boolean canBeDepleted() {
return false;
}
@Override
public boolean isEnchantable(ItemStack p_77616_1_) {
return true;
@ -41,7 +44,7 @@ public class CopperBacktankItem extends CopperArmorItem implements ICapacityEnch
public void fillItemCategory(CreativeModeTab p_150895_1_, NonNullList<ItemStack> p_150895_2_) {
if (!allowdedIn(p_150895_1_))
return;
ItemStack stack = new ItemStack(this);
CompoundTag nbt = new CompoundTag();
nbt.putInt("Air", BackTankUtil.maxAirWithoutEnchants());
@ -68,5 +71,21 @@ public class CopperBacktankItem extends CopperArmorItem implements ICapacityEnch
CompoundTag orCreateTag = stack.getOrCreateTag();
return orCreateTag.getInt("Air");
}
public static class CopperBacktankBlockItem extends BlockItem {
public CopperBacktankBlockItem(Block pBlock, Properties pProperties) {
super(pBlock, pProperties);
}
@Override
public void fillItemCategory(CreativeModeTab pGroup, NonNullList<ItemStack> pItems) {}
@Override
public String getDescriptionId() {
return this.getOrCreateDescriptionId();
}
}
}