mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-09-21 00:48:55 +02:00
Added chest minecart contraption item and wrenching of chest minecart contraptions
This commit is contained in:
grimmauld
parent
7bd339e655
commit
8dff92e0bf
16 changed files with 61 additions and 24 deletions
|
|
@ -392,17 +392,17 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j
|
|||
6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json
|
||||
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
|
||||
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
|
||||
69f3eb168fafdc42a2cba5c5821eeb87dbcdbce7 assets/create/lang/en_ud.json
|
||||
abc5831efdfe57b30706266f99148a753038a875 assets/create/lang/en_us.json
|
||||
6f9c96ce87206a49f85e34341d666b20bc028c3a assets/create/lang/unfinished/de_de.json
|
||||
f174041d9eee734ff7dd78b412843627b4b06b27 assets/create/lang/unfinished/fr_fr.json
|
||||
60bd5b28764875b424f114e885df26820cb57126 assets/create/lang/unfinished/it_it.json
|
||||
9fad65c580adf3b96ea77578b30abbb05b7fa818 assets/create/lang/unfinished/ja_jp.json
|
||||
c0bbd476bdef822e1c66923f071176311ede2be9 assets/create/lang/unfinished/ko_kr.json
|
||||
232f70b11fbc22c06bd58af2e415f3d3571934d1 assets/create/lang/unfinished/nl_nl.json
|
||||
1dcc841771d2def6f06ca67aa4d1e7728299fcec assets/create/lang/unfinished/pt_br.json
|
||||
4aa03cba6a225a079a5270ce5c0d0b0570a3429a assets/create/lang/unfinished/ru_ru.json
|
||||
b082722b88ba8a317fa3c7976628138e6f9d3448 assets/create/lang/unfinished/zh_cn.json
|
||||
04f295b9cbe610bb3664e956437ae68d2a0776ad assets/create/lang/en_ud.json
|
||||
3912eddc0fdb76afe08961c9d9ad9fe776fbbef5 assets/create/lang/en_us.json
|
||||
66e50a9482f186f3b0b066bcc7a8d6194b5892b4 assets/create/lang/unfinished/de_de.json
|
||||
d0adae002c2ca46ad24d4f08037308334c239c69 assets/create/lang/unfinished/fr_fr.json
|
||||
98b6589d85a68eb4460a7d2da96816b026436c14 assets/create/lang/unfinished/it_it.json
|
||||
9a9477f8257367993760fbc9e4b65a2d8190b868 assets/create/lang/unfinished/ja_jp.json
|
||||
e9e466d962ccba589d6d14e37c82e98076a3e614 assets/create/lang/unfinished/ko_kr.json
|
||||
9e8277f247b069bb45fd45b086a5138ec160847f assets/create/lang/unfinished/nl_nl.json
|
||||
707ec25a7f45dd3dca8b96d4031b38d1be64f840 assets/create/lang/unfinished/pt_br.json
|
||||
f645e781db3e254d64ea4b20a553e713bfca3610 assets/create/lang/unfinished/ru_ru.json
|
||||
1e8a48a6ba2d7ec7947c312835c332e869757526 assets/create/lang/unfinished/zh_cn.json
|
||||
846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json
|
||||
1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json
|
||||
1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json
|
||||
|
|
@ -1143,6 +1143,7 @@ a37be4a0ec9bf6c381527403c57ced4f81abd67c assets/create/models/item/brass_nugget.
|
|||
24df6f8391d8ba09cef46e69d65d32ea770745cd assets/create/models/item/brown_seat.json
|
||||
54211d3bdbeba2ea4dbaed43daa740ae3331640f assets/create/models/item/brown_valve_handle.json
|
||||
3e232a103f7f916fc11edb4d541ca99fe7b44181 assets/create/models/item/cart_assembler.json
|
||||
c9be9d3f8d01ed7e283fdcf347c88458af13460a assets/create/models/item/chest_minecart_contraption.json
|
||||
99d64b76b3baa84c3bd4b96ccd3376ca12425950 assets/create/models/item/chiseled_dark_scoria.json
|
||||
83d3571eacde52568786802b268f24c6578c1e5d assets/create/models/item/chiseled_dolomite.json
|
||||
afd697168c9786eb80e54eccdc6a23afa6c7fb0e assets/create/models/item/chiseled_gabbro.json
|
||||
|
|
|
|||
|
|
@ -406,6 +406,7 @@
|
|||
"item.create.brass_ingot": "\u0287obuI ss\u0250\u0279\u15FA",
|
||||
"item.create.brass_nugget": "\u0287\u01DDbbnN ss\u0250\u0279\u15FA",
|
||||
"item.create.brass_sheet": "\u0287\u01DD\u01DD\u0265S ss\u0250\u0279\u15FA",
|
||||
"item.create.chest_minecart_contraption": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u0287\u0279\u0250\u0254\u01DDu\u0131W \u0287s\u01DD\u0265\u0186",
|
||||
"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_ingot": "\u0287obuI \u0279\u01DDddo\u0186",
|
||||
|
|
|
|||
|
|
@ -412,6 +412,7 @@
|
|||
"item.create.brass_ingot": "Brass Ingot",
|
||||
"item.create.brass_nugget": "Brass Nugget",
|
||||
"item.create.brass_sheet": "Brass Sheet",
|
||||
"item.create.chest_minecart_contraption": "Chest Minecart Contraption",
|
||||
"item.create.chromatic_compound": "Chromatic Compound",
|
||||
"item.create.cinder_flour": "Cinder Flour",
|
||||
"item.create.copper_ingot": "Copper Ingot",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 1041",
|
||||
"_": "Missing Localizations: 1042",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -413,6 +413,7 @@
|
|||
"item.create.brass_ingot": "UNLOCALIZED: Brass Ingot",
|
||||
"item.create.brass_nugget": "UNLOCALIZED: Brass Nugget",
|
||||
"item.create.brass_sheet": "UNLOCALIZED: Brass Sheet",
|
||||
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
|
||||
"item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound",
|
||||
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
|
||||
"item.create.copper_ingot": "UNLOCALIZED: Copper Ingot",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 670",
|
||||
"_": "Missing Localizations: 671",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -413,6 +413,7 @@
|
|||
"item.create.brass_ingot": "Lingot de laiton",
|
||||
"item.create.brass_nugget": "Pépite de laiton",
|
||||
"item.create.brass_sheet": "Plaques de laiton",
|
||||
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
|
||||
"item.create.chromatic_compound": "Composé chromatique",
|
||||
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
|
||||
"item.create.copper_ingot": "Lingot de cuivre",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 654",
|
||||
"_": "Missing Localizations: 655",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -413,6 +413,7 @@
|
|||
"item.create.brass_ingot": "Lingotto di Ottone",
|
||||
"item.create.brass_nugget": "Pepita di Ottone",
|
||||
"item.create.brass_sheet": "Lamiera di Ottone",
|
||||
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
|
||||
"item.create.chromatic_compound": "Composto Cromatico",
|
||||
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
|
||||
"item.create.copper_ingot": "Lingotto di Rame",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 653",
|
||||
"_": "Missing Localizations: 654",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -413,6 +413,7 @@
|
|||
"item.create.brass_ingot": "真鍮インゴット",
|
||||
"item.create.brass_nugget": "真鍮ナゲット",
|
||||
"item.create.brass_sheet": "真鍮シート",
|
||||
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
|
||||
"item.create.chromatic_compound": "色彩の化合物",
|
||||
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
|
||||
"item.create.copper_ingot": "銅インゴット",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 654",
|
||||
"_": "Missing Localizations: 655",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -413,6 +413,7 @@
|
|||
"item.create.brass_ingot": "황동 주괴",
|
||||
"item.create.brass_nugget": "황동 조각",
|
||||
"item.create.brass_sheet": "황동 판",
|
||||
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
|
||||
"item.create.chromatic_compound": "색채 혼합물",
|
||||
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
|
||||
"item.create.copper_ingot": "구리 주괴",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 982",
|
||||
"_": "Missing Localizations: 983",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -413,6 +413,7 @@
|
|||
"item.create.brass_ingot": "UNLOCALIZED: Brass Ingot",
|
||||
"item.create.brass_nugget": "Brons klompje",
|
||||
"item.create.brass_sheet": "Brons Platen",
|
||||
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
|
||||
"item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound",
|
||||
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
|
||||
"item.create.copper_ingot": "Koperstaaf",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 1048",
|
||||
"_": "Missing Localizations: 1049",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -413,6 +413,7 @@
|
|||
"item.create.brass_ingot": "UNLOCALIZED: Brass Ingot",
|
||||
"item.create.brass_nugget": "UNLOCALIZED: Brass Nugget",
|
||||
"item.create.brass_sheet": "UNLOCALIZED: Brass Sheet",
|
||||
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
|
||||
"item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound",
|
||||
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
|
||||
"item.create.copper_ingot": "UNLOCALIZED: Copper Ingot",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 323",
|
||||
"_": "Missing Localizations: 324",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -413,6 +413,7 @@
|
|||
"item.create.brass_ingot": "Латунный слиток",
|
||||
"item.create.brass_nugget": "Кусочек латуни",
|
||||
"item.create.brass_sheet": "Латунный лист",
|
||||
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
|
||||
"item.create.chromatic_compound": "Хроматический компаунд",
|
||||
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
|
||||
"item.create.copper_ingot": "Медный слиток",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 336",
|
||||
"_": "Missing Localizations: 337",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -413,6 +413,7 @@
|
|||
"item.create.brass_ingot": "黄铜锭",
|
||||
"item.create.brass_nugget": "黄铜粒",
|
||||
"item.create.brass_sheet": "黄铜板",
|
||||
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
|
||||
"item.create.chromatic_compound": "异彩化合物",
|
||||
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
|
||||
"item.create.copper_ingot": "铜锭",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "create:item/chest_minecart_contraption"
|
||||
}
|
||||
}
|
||||
|
|
@ -168,6 +168,10 @@ public class AllItems {
|
|||
REGISTRATE.item("furnace_minecart_contraption", MinecartContraptionItem::furnace)
|
||||
.register();
|
||||
|
||||
public static final ItemEntry<MinecartContraptionItem> CHEST_MINECART_CONTRAPTION =
|
||||
REGISTRATE.item("chest_minecart_contraption", MinecartContraptionItem::chest)
|
||||
.register();
|
||||
|
||||
// Logistics
|
||||
|
||||
static {
|
||||
|
|
|
|||
|
|
@ -50,6 +50,10 @@ public class MinecartContraptionItem extends Item {
|
|||
return new MinecartContraptionItem(Type.FURNACE, builder);
|
||||
}
|
||||
|
||||
public static MinecartContraptionItem chest(Properties builder) {
|
||||
return new MinecartContraptionItem(Type.CHEST, builder);
|
||||
}
|
||||
|
||||
private MinecartContraptionItem(Type minecartTypeIn, Properties builder) {
|
||||
super(builder);
|
||||
this.minecartType = minecartTypeIn;
|
||||
|
|
@ -199,7 +203,7 @@ public class MinecartContraptionItem extends Item {
|
|||
return;
|
||||
AbstractMinecartEntity cart = (AbstractMinecartEntity) entity;
|
||||
Type type = cart.getMinecartType();
|
||||
if (type != Type.RIDEABLE && type != Type.FURNACE)
|
||||
if (type != Type.RIDEABLE && type != Type.FURNACE && type != Type.CHEST)
|
||||
return;
|
||||
List<Entity> passengers = cart.getPassengers();
|
||||
if (passengers.isEmpty() || !(passengers.get(0) instanceof ContraptionEntity))
|
||||
|
|
@ -217,8 +221,20 @@ public class MinecartContraptionItem extends Item {
|
|||
}
|
||||
|
||||
public static ItemStack create(Type type, ContraptionEntity entity) {
|
||||
ItemStack stack =
|
||||
(type == Type.RIDEABLE ? AllItems.MINECART_CONTRAPTION : AllItems.FURNACE_MINECART_CONTRAPTION).asStack();
|
||||
ItemStack stack = ItemStack.EMPTY;
|
||||
switch (type) {
|
||||
case RIDEABLE:
|
||||
stack = AllItems.MINECART_CONTRAPTION.asStack();
|
||||
break;
|
||||
case FURNACE:
|
||||
stack = AllItems.FURNACE_MINECART_CONTRAPTION.asStack();
|
||||
break;
|
||||
case CHEST:
|
||||
stack = AllItems.CHEST_MINECART_CONTRAPTION.asStack();
|
||||
break;
|
||||
}
|
||||
if (stack == ItemStack.EMPTY)
|
||||
return stack;
|
||||
CompoundNBT tag = entity.getContraption()
|
||||
.writeNBT();
|
||||
tag.remove("UUID");
|
||||
|
|
@ -233,5 +249,4 @@ public class MinecartContraptionItem extends Item {
|
|||
.put("Contraption", tag);
|
||||
return stack;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 582 B |
Loading…
Reference in a new issue