diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index b344fbfc0..c99728601 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -426,20 +426,20 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json 58e72b5fe2423b661e4892a817e08985c3944318 assets/create/lang/en_ud.json -11aa112733e592f4956a52cc3ed4640e36da3f85 assets/create/lang/en_us.json -7be14d4c5b04da2d01c3c498c58aa3f5d2c3f5ff assets/create/lang/unfinished/de_de.json -a97d5f67e1b10b7bd90865d4c38979ac55f6e1a9 assets/create/lang/unfinished/es_es.json -c6067e65d082a7e65df3d0e6a2e34b0641c3608a assets/create/lang/unfinished/es_mx.json -ad6de725cce34a60b6169a9dd801fc3d6414a80b assets/create/lang/unfinished/fr_fr.json -6460fe050efde9460f419aee00a8e8eb1d884a7a assets/create/lang/unfinished/it_it.json -3c0796b466146287fd99a6166781a881c3e0a7a4 assets/create/lang/unfinished/ja_jp.json -fbfd50f5fdb0017963866bf81a15486003a5ea2c assets/create/lang/unfinished/ko_kr.json -bd22d6747a51ffe022c4ad03460a9392176de330 assets/create/lang/unfinished/nl_nl.json -060e368b61b5f43c50b74f42a82973d414de5fca assets/create/lang/unfinished/pl_pl.json -0762cd7b62a5666d2622ef35dadb84626bccf036 assets/create/lang/unfinished/pt_br.json -0deb7d094e8e270d0d702d5e17abe19237751e91 assets/create/lang/unfinished/ru_ru.json -50872bdfe0dfd7e54b1cfa34a0f3be075da12fc4 assets/create/lang/unfinished/zh_cn.json -b21ee1356b57cec916cc6e34e37779b1f3d051de assets/create/lang/unfinished/zh_tw.json +4a4194ce5449e1583ee36c29341cc4877d79a373 assets/create/lang/en_us.json +de9193132de02a00cd23ebedae8d83821de9dfba assets/create/lang/unfinished/de_de.json +590fe29c7bd39daa2da5070e03fb7593c2120e3b assets/create/lang/unfinished/es_es.json +ef8f10561db8afc3623f8d1bbdc237f3c96ebd1c assets/create/lang/unfinished/es_mx.json +6183b79886c714c1f9030fc8d48935084091ac83 assets/create/lang/unfinished/fr_fr.json +116769f08147a9ddfdc1fde4b6cfe6ca4566fefc assets/create/lang/unfinished/it_it.json +39f4fa7d0a9e2c13711794e07175f76f67a8e30a assets/create/lang/unfinished/ja_jp.json +341e5944e9eab4161e9a7cfb38886bba761e8fff assets/create/lang/unfinished/ko_kr.json +de023ad859d0b30b5ddf012289ad172fc082a17d assets/create/lang/unfinished/nl_nl.json +2afd2b149e8536e02f97d8e07983937b967c42ea assets/create/lang/unfinished/pl_pl.json +48fb802167656527ca637056abc4268eb43846bf assets/create/lang/unfinished/pt_br.json +af04157f33a93029ac6e8104adbbbdcb1ba8c3de assets/create/lang/unfinished/ru_ru.json +80716de50f45dcdaaf6972ae5953f3bf0acfd458 assets/create/lang/unfinished/zh_cn.json +b83ba2b55581bda2dc6ba3cc3e2896d068ba51a2 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 diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 4c46a01c1..ccafe4889 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1503,41 +1503,41 @@ "create.ponder.categories": "Available Categories in Create", "create.ponder.index_description": "Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "Ponder Index", - "create.ponder.shared.movement_anchors": "With the help of Chassis or Super Glue, larger structures can be moved.", - "create.ponder.shared.rpm32": "32 RPM", - "create.ponder.shared.sneak_and": "Sneak +", - "create.ponder.shared.storage_on_contraption": "Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.rpm16": "16 RPM", "create.ponder.shared.behaviour_modify_wrench": "This behaviour can be modified using a Wrench", + "create.ponder.shared.storage_on_contraption": "Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.sneak_and": "Sneak +", "create.ponder.shared.rpm8": "8 RPM", "create.ponder.shared.ctrl_and": "Ctrl +", + "create.ponder.shared.rpm32": "32 RPM", "create.ponder.shared.rpm16_source": "Source: 16 RPM", - "create.ponder.shared.rpm16": "16 RPM", - "create.ponder.tag.kinetic_sources": "Kinetic Sources", - "create.ponder.tag.kinetic_sources.description": "Components which generate Rotational Force", - "create.ponder.tag.contraption_actor": "Contraption Actors", - "create.ponder.tag.contraption_actor.description": "Components which expose special behaviour when attached to a moving contraption", - "create.ponder.tag.arm_targets": "Targets for Mechanical Arms", - "create.ponder.tag.arm_targets.description": "Components which can be selected as inputs or outputs to the Mechanical Arm", - "create.ponder.tag.logistics": "Item Transportation", - "create.ponder.tag.logistics.description": "Components which help moving items around", - "create.ponder.tag.movement_anchor": "Movement Anchors", - "create.ponder.tag.movement_anchor.description": "Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", - "create.ponder.tag.creative": "Creative Mode", - "create.ponder.tag.creative.description": "Components not usually available for Survival Mode", - "create.ponder.tag.kinetic_relays": "Kinetic Blocks", - "create.ponder.tag.kinetic_relays.description": "Components which help relaying Rotational Force elsewhere", - "create.ponder.tag.windmill_sails": "Sails for Windmill Bearings", - "create.ponder.tag.windmill_sails.description": "Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", - "create.ponder.tag.contraption_assembly": "Block Attachment Utility", - "create.ponder.tag.contraption_assembly.description": "Tools and Components used to assemble structures moved as an animated Contraption", - "create.ponder.tag.decoration": "Aesthetics", - "create.ponder.tag.decoration.description": "Components used mostly for decorative purposes", - "create.ponder.tag.kinetic_appliances": "Kinetic Appliances", - "create.ponder.tag.kinetic_appliances.description": "Components which make use of Rotational Force", + "create.ponder.shared.movement_anchors": "With the help of Chassis or Super Glue, larger structures can be moved.", "create.ponder.tag.redstone": "Logic Components", "create.ponder.tag.redstone.description": "Components which help with redstone engineering", + "create.ponder.tag.contraption_assembly": "Block Attachment Utility", + "create.ponder.tag.contraption_assembly.description": "Tools and Components used to assemble structures moved as an animated Contraption", "create.ponder.tag.fluids": "Fluid Manipulators", "create.ponder.tag.fluids.description": "Components which help relaying and making use of Fluids", + "create.ponder.tag.decoration": "Aesthetics", + "create.ponder.tag.decoration.description": "Components used mostly for decorative purposes", + "create.ponder.tag.windmill_sails": "Sails for Windmill Bearings", + "create.ponder.tag.windmill_sails.description": "Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", + "create.ponder.tag.arm_targets": "Targets for Mechanical Arms", + "create.ponder.tag.arm_targets.description": "Components which can be selected as inputs or outputs to the Mechanical Arm", + "create.ponder.tag.kinetic_appliances": "Kinetic Appliances", + "create.ponder.tag.kinetic_appliances.description": "Components which make use of Rotational Force", + "create.ponder.tag.kinetic_sources": "Kinetic Sources", + "create.ponder.tag.kinetic_sources.description": "Components which generate Rotational Force", + "create.ponder.tag.movement_anchor": "Movement Anchors", + "create.ponder.tag.movement_anchor.description": "Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", + "create.ponder.tag.kinetic_relays": "Kinetic Blocks", + "create.ponder.tag.kinetic_relays.description": "Components which help relaying Rotational Force elsewhere", + "create.ponder.tag.contraption_actor": "Contraption Actors", + "create.ponder.tag.contraption_actor.description": "Components which expose special behaviour when attached to a moving contraption", + "create.ponder.tag.creative": "Creative Mode", + "create.ponder.tag.creative.description": "Components not usually available for Survival Mode", + "create.ponder.tag.logistics": "Item Transportation", + "create.ponder.tag.logistics.description": "Components which help moving items around", "create.ponder.adjustable_pulse_repeater.header": "Controlling signals using Adjustable Pulse Repeaters", "create.ponder.adjustable_pulse_repeater.text_1": "Adjustable Pulse Repeaters emit a short pulse at a delay", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index a35521306..cb3af9cfe 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "UNLOCALIZED: Available Categories in Create", "create.ponder.index_description": "UNLOCALIZED: Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "UNLOCALIZED: Ponder Index", - "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", - "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", - "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", - "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", "create.ponder.shared.behaviour_modify_wrench": "UNLOCALIZED: This behaviour can be modified using a Wrench", + "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", "create.ponder.shared.rpm8": "UNLOCALIZED: 8 RPM", "create.ponder.shared.ctrl_and": "UNLOCALIZED: Ctrl +", + "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", "create.ponder.shared.rpm16_source": "UNLOCALIZED: Source: 16 RPM", - "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", - "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", - "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", - "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", - "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", - "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", - "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", - "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", - "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", - "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", - "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", - "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", - "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", - "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", - "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", - "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", - "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", - "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", - "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", - "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", - "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", - "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", "create.ponder.tag.redstone": "UNLOCALIZED: Logic Components", "create.ponder.tag.redstone.description": "UNLOCALIZED: Components which help with redstone engineering", + "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", + "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", "create.ponder.tag.fluids": "UNLOCALIZED: Fluid Manipulators", "create.ponder.tag.fluids.description": "UNLOCALIZED: Components which help relaying and making use of Fluids", + "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", + "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", + "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", + "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", + "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", + "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", + "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", + "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", + "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", + "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", + "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", + "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", + "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", + "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", + "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", + "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", + "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", + "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", + "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index 8519828ba..c06b1ffa0 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "Available Categories in Create", "create.ponder.index_description": "Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "Ponder Index", - "create.ponder.shared.movement_anchors": "Con la ayuda de un chasis o pegamento, se pueden mover estructuras más grandes.", - "create.ponder.shared.rpm32": "32 RPM", - "create.ponder.shared.sneak_and": "Mayús izdo. +", - "create.ponder.shared.storage_on_contraption": "Los inventarios unidos al artilugio recogerán sus producciones automáticamente", + "create.ponder.shared.rpm16": "16 RPM", "create.ponder.shared.behaviour_modify_wrench": "Este comportamiento puede modificarse mediante una llave inglesa", + "create.ponder.shared.storage_on_contraption": "Los inventarios unidos al artilugio recogerán sus producciones automáticamente", + "create.ponder.shared.sneak_and": "Mayús izdo. +", "create.ponder.shared.rpm8": "8 RPM", "create.ponder.shared.ctrl_and": "Ctrl +", + "create.ponder.shared.rpm32": "32 RPM", "create.ponder.shared.rpm16_source": "Fuente: 16 RPM", - "create.ponder.shared.rpm16": "16 RPM", - "create.ponder.tag.kinetic_sources": "Fuentes cinéticas", - "create.ponder.tag.kinetic_sources.description": "Componentes que generan fuerza rotacional", - "create.ponder.tag.contraption_actor": "Actores del artilugio", - "create.ponder.tag.contraption_actor.description": "Componentes que exponen un comportamiento especial cuando están unidos a un artilugio en movimiento", - "create.ponder.tag.arm_targets": "Objetivos para los brazos mecánicos", - "create.ponder.tag.arm_targets.description": "Componentes que pueden seleccionarse como entradas o salidas del brazo mecánico", - "create.ponder.tag.logistics": "Transporte de objetos", - "create.ponder.tag.logistics.description": "Componentes que ayudan a desplazar los objetos", - "create.ponder.tag.movement_anchor": "Anclas de movimiento", - "create.ponder.tag.movement_anchor.description": "Componentes que permiten crear artilugios en movimiento, animando una estructura anexa de diversas maneras", - "create.ponder.tag.creative": "Modo creativo", - "create.ponder.tag.creative.description": "Componentes que no suelen estar disponibles para el Modo Supervivencia", - "create.ponder.tag.kinetic_relays": "Transmisores cinéticos", - "create.ponder.tag.kinetic_relays.description": "Componentes que ayudan a transmitir la fuerza rotacional en otro lugar", - "create.ponder.tag.windmill_sails": "Velas para los rodamientos de los molinos de viento", - "create.ponder.tag.windmill_sails.description": "Bloques que cuentan para la fuerza de un artefacto de molino de viento cuando se ensamblan. Cada uno de ellos tiene la misma eficacia al hacerlo.", - "create.ponder.tag.contraption_assembly": "Utilidades para adjuntar bloques", - "create.ponder.tag.contraption_assembly.description": "Herramientas y componentes utilizados para montar estructuras con movimiento, como un artilugio animado", - "create.ponder.tag.decoration": "Estética", - "create.ponder.tag.decoration.description": "Componentes utilizados principalmente con fines decorativos", - "create.ponder.tag.kinetic_appliances": "Dispositivos cinéticos", - "create.ponder.tag.kinetic_appliances.description": "Componentes que utilizan la fuerza rotacional", + "create.ponder.shared.movement_anchors": "Con la ayuda de un chasis o pegamento, se pueden mover estructuras más grandes.", "create.ponder.tag.redstone": "Componentes lógicos", "create.ponder.tag.redstone.description": "Componentes que ayudan a la ingeniería de redstone", + "create.ponder.tag.contraption_assembly": "Utilidades para adjuntar bloques", + "create.ponder.tag.contraption_assembly.description": "Herramientas y componentes utilizados para montar estructuras con movimiento, como un artilugio animado", "create.ponder.tag.fluids": "Manipuladores de fluidos", "create.ponder.tag.fluids.description": "Componentes que ayudan a transportar y utilizar fluidos", + "create.ponder.tag.decoration": "Estética", + "create.ponder.tag.decoration.description": "Componentes utilizados principalmente con fines decorativos", + "create.ponder.tag.windmill_sails": "Velas para los rodamientos de los molinos de viento", + "create.ponder.tag.windmill_sails.description": "Bloques que cuentan para la fuerza de un artefacto de molino de viento cuando se ensamblan. Cada uno de ellos tiene la misma eficacia al hacerlo.", + "create.ponder.tag.arm_targets": "Objetivos para los brazos mecánicos", + "create.ponder.tag.arm_targets.description": "Componentes que pueden seleccionarse como entradas o salidas del brazo mecánico", + "create.ponder.tag.kinetic_appliances": "Dispositivos cinéticos", + "create.ponder.tag.kinetic_appliances.description": "Componentes que utilizan la fuerza rotacional", + "create.ponder.tag.kinetic_sources": "Fuentes cinéticas", + "create.ponder.tag.kinetic_sources.description": "Componentes que generan fuerza rotacional", + "create.ponder.tag.movement_anchor": "Anclas de movimiento", + "create.ponder.tag.movement_anchor.description": "Componentes que permiten crear artilugios en movimiento, animando una estructura anexa de diversas maneras", + "create.ponder.tag.kinetic_relays": "Transmisores cinéticos", + "create.ponder.tag.kinetic_relays.description": "Componentes que ayudan a transmitir la fuerza rotacional en otro lugar", + "create.ponder.tag.contraption_actor": "Actores del artilugio", + "create.ponder.tag.contraption_actor.description": "Componentes que exponen un comportamiento especial cuando están unidos a un artilugio en movimiento", + "create.ponder.tag.creative": "Modo creativo", + "create.ponder.tag.creative.description": "Componentes que no suelen estar disponibles para el Modo Supervivencia", + "create.ponder.tag.logistics": "Transporte de objetos", + "create.ponder.tag.logistics.description": "Componentes que ayudan a desplazar los objetos", "create.ponder.adjustable_pulse_repeater.header": "Controlar señales mediante repetidores de pulsos ajustables", "create.ponder.adjustable_pulse_repeater.text_1": "Los repetidores de pulsos ajustables emiten un pulso corto con un retardo", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_mx.json b/src/generated/resources/assets/create/lang/unfinished/es_mx.json index 1b820a49b..b265816c2 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_mx.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_mx.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "UNLOCALIZED: Available Categories in Create", "create.ponder.index_description": "UNLOCALIZED: Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "UNLOCALIZED: Ponder Index", - "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", - "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", - "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", - "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", "create.ponder.shared.behaviour_modify_wrench": "UNLOCALIZED: This behaviour can be modified using a Wrench", + "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", "create.ponder.shared.rpm8": "UNLOCALIZED: 8 RPM", "create.ponder.shared.ctrl_and": "UNLOCALIZED: Ctrl +", + "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", "create.ponder.shared.rpm16_source": "UNLOCALIZED: Source: 16 RPM", - "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", - "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", - "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", - "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", - "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", - "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", - "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", - "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", - "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", - "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", - "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", - "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", - "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", - "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", - "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", - "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", - "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", - "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", - "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", - "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", - "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", - "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", "create.ponder.tag.redstone": "UNLOCALIZED: Logic Components", "create.ponder.tag.redstone.description": "UNLOCALIZED: Components which help with redstone engineering", + "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", + "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", "create.ponder.tag.fluids": "UNLOCALIZED: Fluid Manipulators", "create.ponder.tag.fluids.description": "UNLOCALIZED: Components which help relaying and making use of Fluids", + "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", + "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", + "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", + "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", + "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", + "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", + "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", + "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", + "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", + "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", + "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", + "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", + "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", + "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", + "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", + "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", + "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", + "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", + "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index c1e42f1ab..da4e0eb8e 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "UNLOCALIZED: Available Categories in Create", "create.ponder.index_description": "UNLOCALIZED: Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "UNLOCALIZED: Ponder Index", - "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", - "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", - "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", - "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", "create.ponder.shared.behaviour_modify_wrench": "UNLOCALIZED: This behaviour can be modified using a Wrench", + "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", "create.ponder.shared.rpm8": "UNLOCALIZED: 8 RPM", "create.ponder.shared.ctrl_and": "UNLOCALIZED: Ctrl +", + "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", "create.ponder.shared.rpm16_source": "UNLOCALIZED: Source: 16 RPM", - "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", - "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", - "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", - "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", - "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", - "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", - "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", - "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", - "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", - "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", - "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", - "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", - "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", - "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", - "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", - "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", - "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", - "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", - "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", - "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", - "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", - "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", "create.ponder.tag.redstone": "UNLOCALIZED: Logic Components", "create.ponder.tag.redstone.description": "UNLOCALIZED: Components which help with redstone engineering", + "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", + "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", "create.ponder.tag.fluids": "UNLOCALIZED: Fluid Manipulators", "create.ponder.tag.fluids.description": "UNLOCALIZED: Components which help relaying and making use of Fluids", + "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", + "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", + "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", + "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", + "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", + "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", + "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", + "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", + "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", + "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", + "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", + "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", + "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", + "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", + "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", + "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", + "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", + "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", + "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 5a8bcc502..7f9cdea78 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "UNLOCALIZED: Available Categories in Create", "create.ponder.index_description": "UNLOCALIZED: Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "UNLOCALIZED: Ponder Index", - "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", - "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", - "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", - "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", "create.ponder.shared.behaviour_modify_wrench": "UNLOCALIZED: This behaviour can be modified using a Wrench", + "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", "create.ponder.shared.rpm8": "UNLOCALIZED: 8 RPM", "create.ponder.shared.ctrl_and": "UNLOCALIZED: Ctrl +", + "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", "create.ponder.shared.rpm16_source": "UNLOCALIZED: Source: 16 RPM", - "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", - "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", - "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", - "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", - "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", - "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", - "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", - "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", - "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", - "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", - "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", - "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", - "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", - "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", - "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", - "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", - "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", - "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", - "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", - "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", - "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", - "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", "create.ponder.tag.redstone": "UNLOCALIZED: Logic Components", "create.ponder.tag.redstone.description": "UNLOCALIZED: Components which help with redstone engineering", + "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", + "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", "create.ponder.tag.fluids": "UNLOCALIZED: Fluid Manipulators", "create.ponder.tag.fluids.description": "UNLOCALIZED: Components which help relaying and making use of Fluids", + "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", + "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", + "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", + "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", + "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", + "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", + "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", + "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", + "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", + "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", + "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", + "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", + "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", + "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", + "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", + "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", + "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", + "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", + "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index 708242d90..74f647924 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "Createで利用可能なカゴテリ", "create.ponder.index_description": "アイテムをクリックすると、関連するアイテムやブロックの情報が表示されます。", "create.ponder.index_title": "思案索引", - "create.ponder.shared.movement_anchors": "シャーシや超粘着剤を使えば大きな構造物も動かせます", - "create.ponder.shared.rpm32": "32 RPM", - "create.ponder.shared.sneak_and": "スニーク +", - "create.ponder.shared.storage_on_contraption": "構造物中の収納ブロックは自動的にドロップを拾います", + "create.ponder.shared.rpm16": "16 RPM", "create.ponder.shared.behaviour_modify_wrench": "この挙動はレンチを使って変更できます", + "create.ponder.shared.storage_on_contraption": "構造物中の収納ブロックは自動的にドロップを拾います", + "create.ponder.shared.sneak_and": "スニーク +", "create.ponder.shared.rpm8": "8 RPM", "create.ponder.shared.ctrl_and": "Ctrl +", + "create.ponder.shared.rpm32": "32 RPM", "create.ponder.shared.rpm16_source": "動力源: 16 RPM", - "create.ponder.shared.rpm16": "16 RPM", - "create.ponder.tag.kinetic_sources": "原動機", - "create.ponder.tag.kinetic_sources.description": "回転力を生み出す機械です", - "create.ponder.tag.contraption_actor": "からくり構造部品", - "create.ponder.tag.contraption_actor.description": "ブロックを動かす機械に取り付けたときに特別な動作をする機械です", - "create.ponder.tag.arm_targets": "メカニカルアームのターゲット", - "create.ponder.tag.arm_targets.description": "メカニカルアームの搬入元または搬出先にできる機械/ブロックです", - "create.ponder.tag.logistics": "輸送機械", - "create.ponder.tag.logistics.description": "アイテムの運搬を補助する機械です", - "create.ponder.tag.movement_anchor": "からくり機械", - "create.ponder.tag.movement_anchor.description": "取り付けたブロック構造物を様々な方法で動かすことができるからくりを作ることができる機械です", - "create.ponder.tag.creative": "クリエイティブ限定", - "create.ponder.tag.creative.description": "サバイバルモードでは通常入手できない機械です", - "create.ponder.tag.kinetic_relays": "伝達機械", - "create.ponder.tag.kinetic_relays.description": "回転力の伝達に役立つ機械です", - "create.ponder.tag.windmill_sails": "風車ベアリング用の帆", - "create.ponder.tag.windmill_sails.description": "風車につける構造物を組み立てたときに帆にカウントされるブロック。どのブロックを使っても同じ効率です", - "create.ponder.tag.contraption_assembly": "ブロック組み立て用品", - "create.ponder.tag.contraption_assembly.description": "アニメーションして動く構造物を組み立てるための道具や機械です", - "create.ponder.tag.decoration": "装飾", - "create.ponder.tag.decoration.description": "主に装飾に使うブロックです", - "create.ponder.tag.kinetic_appliances": "作業機械", - "create.ponder.tag.kinetic_appliances.description": "回転力を利用する機械です", + "create.ponder.shared.movement_anchors": "シャーシや超粘着剤を使えば大きな構造物も動かせます", "create.ponder.tag.redstone": "制御機械", "create.ponder.tag.redstone.description": "レッドストーン工学に役立つ機械です", + "create.ponder.tag.contraption_assembly": "ブロック組み立て用品", + "create.ponder.tag.contraption_assembly.description": "アニメーションして動く構造物を組み立てるための道具や機械です", "create.ponder.tag.fluids": "液体制御機械", "create.ponder.tag.fluids.description": "液体の輸送や利用に役立つ機械です", + "create.ponder.tag.decoration": "装飾", + "create.ponder.tag.decoration.description": "主に装飾に使うブロックです", + "create.ponder.tag.windmill_sails": "風車ベアリング用の帆", + "create.ponder.tag.windmill_sails.description": "風車につける構造物を組み立てたときに帆にカウントされるブロック。どのブロックを使っても同じ効率です", + "create.ponder.tag.arm_targets": "メカニカルアームのターゲット", + "create.ponder.tag.arm_targets.description": "メカニカルアームの搬入元または搬出先にできる機械/ブロックです", + "create.ponder.tag.kinetic_appliances": "作業機械", + "create.ponder.tag.kinetic_appliances.description": "回転力を利用する機械です", + "create.ponder.tag.kinetic_sources": "原動機", + "create.ponder.tag.kinetic_sources.description": "回転力を生み出す機械です", + "create.ponder.tag.movement_anchor": "からくり機械", + "create.ponder.tag.movement_anchor.description": "取り付けたブロック構造物を様々な方法で動かすことができるからくりを作ることができる機械です", + "create.ponder.tag.kinetic_relays": "伝達機械", + "create.ponder.tag.kinetic_relays.description": "回転力の伝達に役立つ機械です", + "create.ponder.tag.contraption_actor": "からくり構造部品", + "create.ponder.tag.contraption_actor.description": "ブロックを動かす機械に取り付けたときに特別な動作をする機械です", + "create.ponder.tag.creative": "クリエイティブ限定", + "create.ponder.tag.creative.description": "サバイバルモードでは通常入手できない機械です", + "create.ponder.tag.logistics": "輸送機械", + "create.ponder.tag.logistics.description": "アイテムの運搬を補助する機械です", "create.ponder.adjustable_pulse_repeater.header": "可変パルスリピーターによる信号制御", "create.ponder.adjustable_pulse_repeater.text_1": "可変パルスリピーターは信号を遅延し、短いパルスにして出力します", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index a54728c08..36354049d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "Create에서 둘러볼 수 있는 목록들", "create.ponder.index_description": "아이콘을 클릭해 관련 아이템과 블록에 대해 알아볼 수 있습니다.", "create.ponder.index_title": "분석 메뉴 제목", - "create.ponder.shared.movement_anchors": "섀시나 강력 접착제로 큰 구조물도 옮길 수 있습니다.", - "create.ponder.shared.rpm32": "32 RPM", - "create.ponder.shared.sneak_and": "웅크리기 +", - "create.ponder.shared.storage_on_contraption": "구조물에 부착된 보관함은 구조물이 떨어뜨린 아이템을 자동으로 줍습니다.", + "create.ponder.shared.rpm16": "16 RPM", "create.ponder.shared.behaviour_modify_wrench": "이 기능은 렌치를 이용해 변경할 수 있습니다.", + "create.ponder.shared.storage_on_contraption": "구조물에 부착된 보관함은 구조물이 떨어뜨린 아이템을 자동으로 줍습니다.", + "create.ponder.shared.sneak_and": "웅크리기 +", "create.ponder.shared.rpm8": "8 RPM", "create.ponder.shared.ctrl_and": "Ctrl +", + "create.ponder.shared.rpm32": "32 RPM", "create.ponder.shared.rpm16_source": "기본 속도: 16 RPM", - "create.ponder.shared.rpm16": "16 RPM", - "create.ponder.tag.kinetic_sources": "동력 생산", - "create.ponder.tag.kinetic_sources.description": "동력을 생산하는 장치입니다.", - "create.ponder.tag.contraption_actor": "구조물 장치", - "create.ponder.tag.contraption_actor.description": "움직이는 구조물에 부착되어 특정 기능을 수행하는 장치입니다.", - "create.ponder.tag.arm_targets": "기계 팔의 목표 대상", - "create.ponder.tag.arm_targets.description": "기계 팔이 가져가거나 놓을 곳으로 선택할 수 있는 부품입니다.", - "create.ponder.tag.logistics": "아이템 수송", - "create.ponder.tag.logistics.description": "아이템을 옮기는데 도움을 줄 부품입니다.", - "create.ponder.tag.movement_anchor": "이동 고정장치", - "create.ponder.tag.movement_anchor.description": "부착된 구조물을 다양한 방법으로 움직이게하는 장치입니다.", - "create.ponder.tag.creative": "크리에이티브 모드", - "create.ponder.tag.creative.description": "서바이벌 모드에서는 얻을 수 없는 부품입니다.", - "create.ponder.tag.kinetic_relays": "동력 부품", - "create.ponder.tag.kinetic_relays.description": "동력을 다른 곳으로 연결할 때 도움을 주는 부품입니다.", - "create.ponder.tag.windmill_sails": "풍차 베어링의 날개", - "create.ponder.tag.windmill_sails.description": "조립되었을 때 풍차 구조물의 동력에 영향을 주는 블록들입니다. 이 블록들은 동일한 효율을 가집니다.", - "create.ponder.tag.contraption_assembly": "블록 부착 도구", - "create.ponder.tag.contraption_assembly.description": "블록들을 이어 구조물로 만들게해주는 도구와 부품입니다.", - "create.ponder.tag.decoration": "장식", - "create.ponder.tag.decoration.description": "주로 장식 용도로 쓰이는 부품입니다.", - "create.ponder.tag.kinetic_appliances": "동력 장치", - "create.ponder.tag.kinetic_appliances.description": "동력을 사용하는 장치입니다.", + "create.ponder.shared.movement_anchors": "섀시나 강력 접착제로 큰 구조물도 옮길 수 있습니다.", "create.ponder.tag.redstone": "레드스톤 부품", "create.ponder.tag.redstone.description": "레드스톤 공학에 쓰이는 부품입니다.", + "create.ponder.tag.contraption_assembly": "블록 부착 도구", + "create.ponder.tag.contraption_assembly.description": "블록들을 이어 구조물로 만들게해주는 도구와 부품입니다.", "create.ponder.tag.fluids": "액체 조정", "create.ponder.tag.fluids.description": "액체를 나르고 사용하는 장치입니다.", + "create.ponder.tag.decoration": "장식", + "create.ponder.tag.decoration.description": "주로 장식 용도로 쓰이는 부품입니다.", + "create.ponder.tag.windmill_sails": "풍차 베어링의 날개", + "create.ponder.tag.windmill_sails.description": "조립되었을 때 풍차 구조물의 동력에 영향을 주는 블록들입니다. 이 블록들은 동일한 효율을 가집니다.", + "create.ponder.tag.arm_targets": "기계 팔의 목표 대상", + "create.ponder.tag.arm_targets.description": "기계 팔이 가져가거나 놓을 곳으로 선택할 수 있는 부품입니다.", + "create.ponder.tag.kinetic_appliances": "동력 장치", + "create.ponder.tag.kinetic_appliances.description": "동력을 사용하는 장치입니다.", + "create.ponder.tag.kinetic_sources": "동력 생산", + "create.ponder.tag.kinetic_sources.description": "동력을 생산하는 장치입니다.", + "create.ponder.tag.movement_anchor": "이동 고정장치", + "create.ponder.tag.movement_anchor.description": "부착된 구조물을 다양한 방법으로 움직이게하는 장치입니다.", + "create.ponder.tag.kinetic_relays": "동력 부품", + "create.ponder.tag.kinetic_relays.description": "동력을 다른 곳으로 연결할 때 도움을 주는 부품입니다.", + "create.ponder.tag.contraption_actor": "구조물 장치", + "create.ponder.tag.contraption_actor.description": "움직이는 구조물에 부착되어 특정 기능을 수행하는 장치입니다.", + "create.ponder.tag.creative": "크리에이티브 모드", + "create.ponder.tag.creative.description": "서바이벌 모드에서는 얻을 수 없는 부품입니다.", + "create.ponder.tag.logistics": "아이템 수송", + "create.ponder.tag.logistics.description": "아이템을 옮기는데 도움을 줄 부품입니다.", "create.ponder.adjustable_pulse_repeater.header": "가변 펄스 리피터를 이용해 신호 조절하기", "create.ponder.adjustable_pulse_repeater.text_1": "가변 펄스 리피터는 딜레이 이후 짧은 신호를 보냅니다.", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index 0a2818f35..4df5bbe32 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "UNLOCALIZED: Available Categories in Create", "create.ponder.index_description": "UNLOCALIZED: Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "UNLOCALIZED: Ponder Index", - "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", - "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", - "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", - "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", "create.ponder.shared.behaviour_modify_wrench": "UNLOCALIZED: This behaviour can be modified using a Wrench", + "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", "create.ponder.shared.rpm8": "UNLOCALIZED: 8 RPM", "create.ponder.shared.ctrl_and": "UNLOCALIZED: Ctrl +", + "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", "create.ponder.shared.rpm16_source": "UNLOCALIZED: Source: 16 RPM", - "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", - "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", - "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", - "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", - "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", - "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", - "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", - "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", - "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", - "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", - "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", - "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", - "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", - "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", - "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", - "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", - "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", - "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", - "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", - "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", - "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", - "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", "create.ponder.tag.redstone": "UNLOCALIZED: Logic Components", "create.ponder.tag.redstone.description": "UNLOCALIZED: Components which help with redstone engineering", + "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", + "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", "create.ponder.tag.fluids": "UNLOCALIZED: Fluid Manipulators", "create.ponder.tag.fluids.description": "UNLOCALIZED: Components which help relaying and making use of Fluids", + "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", + "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", + "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", + "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", + "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", + "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", + "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", + "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", + "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", + "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", + "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", + "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", + "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", + "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", + "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", + "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", + "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", + "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", + "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index c830498fc..6ac659905 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "UNLOCALIZED: Available Categories in Create", "create.ponder.index_description": "UNLOCALIZED: Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "UNLOCALIZED: Ponder Index", - "create.ponder.shared.movement_anchors": "Z pomocą stelaży lub Super Glue, większe struktury mogą być przesuwane.", - "create.ponder.shared.rpm32": "32 Ob/min", - "create.ponder.shared.sneak_and": "Skradanie +", - "create.ponder.shared.storage_on_contraption": "Pojemniki przyłączone do maszyny będą podnosiły przedmioty automatycznie", + "create.ponder.shared.rpm16": "16 Ob/min", "create.ponder.shared.behaviour_modify_wrench": "To zachowanie może być zmodyfikowane przy pomocy klucza", + "create.ponder.shared.storage_on_contraption": "Pojemniki przyłączone do maszyny będą podnosiły przedmioty automatycznie", + "create.ponder.shared.sneak_and": "Skradanie +", "create.ponder.shared.rpm8": "8 Ob/min", "create.ponder.shared.ctrl_and": "Ctrl +", + "create.ponder.shared.rpm32": "32 Ob/min", "create.ponder.shared.rpm16_source": "Źródło: 16 Ob/min", - "create.ponder.shared.rpm16": "16 Ob/min", - "create.ponder.tag.kinetic_sources": "Źródła siły obrotowej", - "create.ponder.tag.kinetic_sources.description": "Komponenty, które generują siłę obrotu", - "create.ponder.tag.contraption_actor": "Komponenty aktywne maszyn", - "create.ponder.tag.contraption_actor.description": "Komponenty, które posiadają specjalne zachowanie będąc podłączonymi do maszyny", - "create.ponder.tag.arm_targets": "Cele dla mechanicznego ramienia", - "create.ponder.tag.arm_targets.description": "Komponenty, które mogą być wybrane, jako wejście lub wyjście dla mechanicznego ramienia", - "create.ponder.tag.logistics": "Transport przedmiotów", - "create.ponder.tag.logistics.description": "Komponenty, które pomagają w transporcie przedmiotów", - "create.ponder.tag.movement_anchor": "Komponenty ruchome", - "create.ponder.tag.movement_anchor.description": "Komponenty, które pozwalają na tworzenie ruchomych maszyn, poruszając ją na wiele różnych sposobów.", - "create.ponder.tag.creative": "Tryb kreatywny", - "create.ponder.tag.creative.description": "Komponenty niedostępne na trybie przetrwania", - "create.ponder.tag.kinetic_relays": "Bloki obrotowe", - "create.ponder.tag.kinetic_relays.description": "Komponenty, które pomagają w przekazywaniu siły obrotowej w inne miejsca", - "create.ponder.tag.windmill_sails": "Bloki żaglo-podobne", - "create.ponder.tag.windmill_sails.description": "Bloki, które dokładają się do siły, z jaką obracają się łopaty maszyny wiatrakowej.", - "create.ponder.tag.contraption_assembly": "Bloki do tworzenia maszyn", - "create.ponder.tag.contraption_assembly.description": "Narzędzia i komponenty używane do konstrukcji ruchomych maszyn", - "create.ponder.tag.decoration": "Dekoracje", - "create.ponder.tag.decoration.description": "Komponenty używane głównie do celów estetycznych", - "create.ponder.tag.kinetic_appliances": "Urządzenia obrotowe", - "create.ponder.tag.kinetic_appliances.description": "Komponenty używające siły obrotowej", + "create.ponder.shared.movement_anchors": "Z pomocą stelaży lub Super Glue, większe struktury mogą być przesuwane.", "create.ponder.tag.redstone": "Komponenty logiczne", "create.ponder.tag.redstone.description": "Komponenty przydatne w Redstonie", + "create.ponder.tag.contraption_assembly": "Bloki do tworzenia maszyn", + "create.ponder.tag.contraption_assembly.description": "Narzędzia i komponenty używane do konstrukcji ruchomych maszyn", "create.ponder.tag.fluids": "Manipulator płynów", "create.ponder.tag.fluids.description": "Komponenty przydatne przy pracy z płynami", + "create.ponder.tag.decoration": "Dekoracje", + "create.ponder.tag.decoration.description": "Komponenty używane głównie do celów estetycznych", + "create.ponder.tag.windmill_sails": "Bloki żaglo-podobne", + "create.ponder.tag.windmill_sails.description": "Bloki, które dokładają się do siły, z jaką obracają się łopaty maszyny wiatrakowej.", + "create.ponder.tag.arm_targets": "Cele dla mechanicznego ramienia", + "create.ponder.tag.arm_targets.description": "Komponenty, które mogą być wybrane, jako wejście lub wyjście dla mechanicznego ramienia", + "create.ponder.tag.kinetic_appliances": "Urządzenia obrotowe", + "create.ponder.tag.kinetic_appliances.description": "Komponenty używające siły obrotowej", + "create.ponder.tag.kinetic_sources": "Źródła siły obrotowej", + "create.ponder.tag.kinetic_sources.description": "Komponenty, które generują siłę obrotu", + "create.ponder.tag.movement_anchor": "Komponenty ruchome", + "create.ponder.tag.movement_anchor.description": "Komponenty, które pozwalają na tworzenie ruchomych maszyn, poruszając ją na wiele różnych sposobów.", + "create.ponder.tag.kinetic_relays": "Bloki obrotowe", + "create.ponder.tag.kinetic_relays.description": "Komponenty, które pomagają w przekazywaniu siły obrotowej w inne miejsca", + "create.ponder.tag.contraption_actor": "Komponenty aktywne maszyn", + "create.ponder.tag.contraption_actor.description": "Komponenty, które posiadają specjalne zachowanie będąc podłączonymi do maszyny", + "create.ponder.tag.creative": "Tryb kreatywny", + "create.ponder.tag.creative.description": "Komponenty niedostępne na trybie przetrwania", + "create.ponder.tag.logistics": "Transport przedmiotów", + "create.ponder.tag.logistics.description": "Komponenty, które pomagają w transporcie przedmiotów", "create.ponder.adjustable_pulse_repeater.header": "Kontrola sygnałów z wykorzystaniem regulowanych przekaźników pulsu", "create.ponder.adjustable_pulse_repeater.text_1": "Regulowane przekaźniki pulsu emitują krótki puls po opóźnieniu", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index 8640c064c..cb5b10584 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "UNLOCALIZED: Available Categories in Create", "create.ponder.index_description": "UNLOCALIZED: Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "UNLOCALIZED: Ponder Index", - "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", - "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", - "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", - "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", "create.ponder.shared.behaviour_modify_wrench": "UNLOCALIZED: This behaviour can be modified using a Wrench", + "create.ponder.shared.storage_on_contraption": "UNLOCALIZED: Inventories attached to the Contraption will pick up their drops automatically", + "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", "create.ponder.shared.rpm8": "UNLOCALIZED: 8 RPM", "create.ponder.shared.ctrl_and": "UNLOCALIZED: Ctrl +", + "create.ponder.shared.rpm32": "UNLOCALIZED: 32 RPM", "create.ponder.shared.rpm16_source": "UNLOCALIZED: Source: 16 RPM", - "create.ponder.shared.rpm16": "UNLOCALIZED: 16 RPM", - "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", - "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", - "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", - "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", - "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", - "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", - "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", - "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", - "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", - "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", - "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", - "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", - "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", - "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", - "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", - "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", - "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", - "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", - "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", - "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", - "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.shared.movement_anchors": "UNLOCALIZED: With the help of Chassis or Super Glue, larger structures can be moved.", "create.ponder.tag.redstone": "UNLOCALIZED: Logic Components", "create.ponder.tag.redstone.description": "UNLOCALIZED: Components which help with redstone engineering", + "create.ponder.tag.contraption_assembly": "UNLOCALIZED: Block Attachment Utility", + "create.ponder.tag.contraption_assembly.description": "UNLOCALIZED: Tools and Components used to assemble structures moved as an animated Contraption", "create.ponder.tag.fluids": "UNLOCALIZED: Fluid Manipulators", "create.ponder.tag.fluids.description": "UNLOCALIZED: Components which help relaying and making use of Fluids", + "create.ponder.tag.decoration": "UNLOCALIZED: Aesthetics", + "create.ponder.tag.decoration.description": "UNLOCALIZED: Components used mostly for decorative purposes", + "create.ponder.tag.windmill_sails": "UNLOCALIZED: Sails for Windmill Bearings", + "create.ponder.tag.windmill_sails.description": "UNLOCALIZED: Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so.", + "create.ponder.tag.arm_targets": "UNLOCALIZED: Targets for Mechanical Arms", + "create.ponder.tag.arm_targets.description": "UNLOCALIZED: Components which can be selected as inputs or outputs to the Mechanical Arm", + "create.ponder.tag.kinetic_appliances": "UNLOCALIZED: Kinetic Appliances", + "create.ponder.tag.kinetic_appliances.description": "UNLOCALIZED: Components which make use of Rotational Force", + "create.ponder.tag.kinetic_sources": "UNLOCALIZED: Kinetic Sources", + "create.ponder.tag.kinetic_sources.description": "UNLOCALIZED: Components which generate Rotational Force", + "create.ponder.tag.movement_anchor": "UNLOCALIZED: Movement Anchors", + "create.ponder.tag.movement_anchor.description": "UNLOCALIZED: Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways", + "create.ponder.tag.kinetic_relays": "UNLOCALIZED: Kinetic Blocks", + "create.ponder.tag.kinetic_relays.description": "UNLOCALIZED: Components which help relaying Rotational Force elsewhere", + "create.ponder.tag.contraption_actor": "UNLOCALIZED: Contraption Actors", + "create.ponder.tag.contraption_actor.description": "UNLOCALIZED: Components which expose special behaviour when attached to a moving contraption", + "create.ponder.tag.creative": "UNLOCALIZED: Creative Mode", + "create.ponder.tag.creative.description": "UNLOCALIZED: Components not usually available for Survival Mode", + "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", + "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index 3a0da71be..2c5b83ea7 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "UNLOCALIZED: Available Categories in Create", "create.ponder.index_description": "UNLOCALIZED: Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "UNLOCALIZED: Ponder Index", - "create.ponder.shared.movement_anchors": "С помощью Суперклея или Шасси, более крупные структуры могут быть сдивинуты.", - "create.ponder.shared.rpm32": "32 об./мин.", - "create.ponder.shared.sneak_and": "Красться +", - "create.ponder.shared.storage_on_contraption": "Присоединённые к Штуковине инвентари будут подбирать вещи автоматически", + "create.ponder.shared.rpm16": "16 об./мин.", "create.ponder.shared.behaviour_modify_wrench": "Это поведение может быть изменено Ключом", + "create.ponder.shared.storage_on_contraption": "Присоединённые к Штуковине инвентари будут подбирать вещи автоматически", + "create.ponder.shared.sneak_and": "Красться +", "create.ponder.shared.rpm8": "8 об./мин.", "create.ponder.shared.ctrl_and": "Ctrl +", + "create.ponder.shared.rpm32": "32 об./мин.", "create.ponder.shared.rpm16_source": "Источник: 16 об./мин.", - "create.ponder.shared.rpm16": "16 об./мин.", - "create.ponder.tag.kinetic_sources": "Кинетические источники", - "create.ponder.tag.kinetic_sources.description": "Компоненты, генерирующие Силу Вращения", - "create.ponder.tag.contraption_actor": "Компоненты Штуковин", - "create.ponder.tag.contraption_actor.description": "Компоненты, проявляющие особое поведение когда прикреплены к двигающейся штуковине", - "create.ponder.tag.arm_targets": "Цели для Механической Руки", - "create.ponder.tag.arm_targets.description": "Компоненты, которые могут быть выбраны входами или выходами для Механической Руки", - "create.ponder.tag.logistics": "Транспортировка Предметов", - "create.ponder.tag.logistics.description": "Компоненты, помогающие перемещать предметы", - "create.ponder.tag.movement_anchor": "Опоры Движения", - "create.ponder.tag.movement_anchor.description": "Компоненты, позволяющие создавать двигающиеся штуковины, оживляя прикрепленную структуру разными способами", - "create.ponder.tag.creative": "Творческий режим", - "create.ponder.tag.creative.description": "Компоненты обычычно недоступные в Режиме Выживания", - "create.ponder.tag.kinetic_relays": "Кинетические блоки", - "create.ponder.tag.kinetic_relays.description": "Компоненты, помогающие передавать Силу Вращения куда-нибудь", - "create.ponder.tag.windmill_sails": "Паруса для Мельничных Подшипников", - "create.ponder.tag.windmill_sails.description": "Блоки, число которых увеличивает силу Мельницы. Каждый из этих блоков имеет одинаковую эффективность в деле.", - "create.ponder.tag.contraption_assembly": "Приспособления для присоединения блоков", - "create.ponder.tag.contraption_assembly.description": "Инструменты и Компоненты используемые для сборки структур передвигаемых как движущиеся Штуковины", - "create.ponder.tag.decoration": "Эстетика", - "create.ponder.tag.decoration.description": "Компоненты, чаще всего используемые для декоративных целей", - "create.ponder.tag.kinetic_appliances": "Кинетические Приборы", - "create.ponder.tag.kinetic_appliances.description": "Компоненты, использующие Силу Вращения", + "create.ponder.shared.movement_anchors": "С помощью Суперклея или Шасси, более крупные структуры могут быть сдивинуты.", "create.ponder.tag.redstone": "Логические Компоненты", "create.ponder.tag.redstone.description": "Компоненты, помогающие с конструироваением Редстоун Схем", + "create.ponder.tag.contraption_assembly": "Приспособления для присоединения блоков", + "create.ponder.tag.contraption_assembly.description": "Инструменты и Компоненты используемые для сборки структур передвигаемых как движущиеся Штуковины", "create.ponder.tag.fluids": "Жидкостные Манипуляторы", "create.ponder.tag.fluids.description": "Компоненты, помогающие перемещать и использовать Жидкости", + "create.ponder.tag.decoration": "Эстетика", + "create.ponder.tag.decoration.description": "Компоненты, чаще всего используемые для декоративных целей", + "create.ponder.tag.windmill_sails": "Паруса для Мельничных Подшипников", + "create.ponder.tag.windmill_sails.description": "Блоки, число которых увеличивает силу Мельницы. Каждый из этих блоков имеет одинаковую эффективность в деле.", + "create.ponder.tag.arm_targets": "Цели для Механической Руки", + "create.ponder.tag.arm_targets.description": "Компоненты, которые могут быть выбраны входами или выходами для Механической Руки", + "create.ponder.tag.kinetic_appliances": "Кинетические Приборы", + "create.ponder.tag.kinetic_appliances.description": "Компоненты, использующие Силу Вращения", + "create.ponder.tag.kinetic_sources": "Кинетические источники", + "create.ponder.tag.kinetic_sources.description": "Компоненты, генерирующие Силу Вращения", + "create.ponder.tag.movement_anchor": "Опоры Движения", + "create.ponder.tag.movement_anchor.description": "Компоненты, позволяющие создавать двигающиеся штуковины, оживляя прикрепленную структуру разными способами", + "create.ponder.tag.kinetic_relays": "Кинетические блоки", + "create.ponder.tag.kinetic_relays.description": "Компоненты, помогающие передавать Силу Вращения куда-нибудь", + "create.ponder.tag.contraption_actor": "Компоненты Штуковин", + "create.ponder.tag.contraption_actor.description": "Компоненты, проявляющие особое поведение когда прикреплены к двигающейся штуковине", + "create.ponder.tag.creative": "Творческий режим", + "create.ponder.tag.creative.description": "Компоненты обычычно недоступные в Режиме Выживания", + "create.ponder.tag.logistics": "Транспортировка Предметов", + "create.ponder.tag.logistics.description": "Компоненты, помогающие перемещать предметы", "create.ponder.adjustable_pulse_repeater.header": "Управлении сигналами с помощью Регулируемого импульсного повторителя", "create.ponder.adjustable_pulse_repeater.text_1": "Регулируемые импульсные повторители испускают короткий импульс с задержкой", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index 2d5d6ebb6..c46fc000a 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "UNLOCALIZED: Available Categories in Create", "create.ponder.index_description": "UNLOCALIZED: Click one of the icons to learn about its associated Items and Blocks", "create.ponder.index_title": "UNLOCALIZED: Ponder Index", - "create.ponder.shared.movement_anchors": "有了底盘和强力胶，移动起大型结构轻轻松松。", - "create.ponder.shared.rpm32": "32 RPM", - "create.ponder.shared.sneak_and": "潜行 +", - "create.ponder.shared.storage_on_contraption": "与装置相接的存储空间，会自动将装置遇到的掉落物拾取到空间内。", + "create.ponder.shared.rpm16": "16 RPM", "create.ponder.shared.behaviour_modify_wrench": "可以用扳手调整它的行为。", + "create.ponder.shared.storage_on_contraption": "与装置相接的存储空间，会自动将装置遇到的掉落物拾取到空间内。", + "create.ponder.shared.sneak_and": "潜行 +", "create.ponder.shared.rpm8": "8 RPM", "create.ponder.shared.ctrl_and": "Ctrl +", + "create.ponder.shared.rpm32": "32 RPM", "create.ponder.shared.rpm16_source": "动力源：16 R", - "create.ponder.shared.rpm16": "16 RPM", - "create.ponder.tag.kinetic_sources": "动力源", - "create.ponder.tag.kinetic_sources.description": "能够发生动力的组件。", - "create.ponder.tag.contraption_actor": "装置执行组件", - "create.ponder.tag.contraption_actor.description": "能在移动的装置上执行特殊功能的组件", - "create.ponder.tag.arm_targets": "机械臂的工作目标", - "create.ponder.tag.arm_targets.description": "该组件可做为机械臂的输入或者输出点。", - "create.ponder.tag.logistics": "物品运输", - "create.ponder.tag.logistics.description": "该组件可以协助物品运输", - "create.ponder.tag.movement_anchor": "运动源泉", - "create.ponder.tag.movement_anchor.description": "有了它，运动装置才得以可能，它可以以数种方式使相接的结构运动起来。", - "create.ponder.tag.creative": "创造模式", - "create.ponder.tag.creative.description": "总有些东西是生存模式得不到的。", - "create.ponder.tag.kinetic_relays": "动力方块", - "create.ponder.tag.kinetic_relays.description": "用于传递旋转力的组件。", - "create.ponder.tag.windmill_sails": "风车轴承的帆", - "create.ponder.tag.windmill_sails.description": "在进行风车组装时会被算入风车旋转力的方块，这些方块的效能都是一样的。", - "create.ponder.tag.contraption_assembly": "方块连接物件", - "create.ponder.tag.contraption_assembly.description": "将各个组件连接以便同时运动的物件", - "create.ponder.tag.decoration": "装饰", - "create.ponder.tag.decoration.description": "装饰是这些组件的常见用法。", - "create.ponder.tag.kinetic_appliances": "动力设备", - "create.ponder.tag.kinetic_appliances.description": "这些组件可以利用旋转力进行工作。", + "create.ponder.shared.movement_anchors": "有了底盘和强力胶，移动起大型结构轻轻松松。", "create.ponder.tag.redstone": "逻辑组件", "create.ponder.tag.redstone.description": "这些组件会在红石工程中发挥大用处。", + "create.ponder.tag.contraption_assembly": "方块连接物件", + "create.ponder.tag.contraption_assembly.description": "将各个组件连接以便同时运动的物件", "create.ponder.tag.fluids": "流体操纵器械", "create.ponder.tag.fluids.description": "这些组件可以用于传递流体，以及利用流体进行工作。", + "create.ponder.tag.decoration": "装饰", + "create.ponder.tag.decoration.description": "装饰是这些组件的常见用法。", + "create.ponder.tag.windmill_sails": "风车轴承的帆", + "create.ponder.tag.windmill_sails.description": "在进行风车组装时会被算入风车旋转力的方块，这些方块的效能都是一样的。", + "create.ponder.tag.arm_targets": "机械臂的工作目标", + "create.ponder.tag.arm_targets.description": "该组件可做为机械臂的输入或者输出点。", + "create.ponder.tag.kinetic_appliances": "动力设备", + "create.ponder.tag.kinetic_appliances.description": "这些组件可以利用旋转力进行工作。", + "create.ponder.tag.kinetic_sources": "动力源", + "create.ponder.tag.kinetic_sources.description": "能够发生动力的组件。", + "create.ponder.tag.movement_anchor": "运动源泉", + "create.ponder.tag.movement_anchor.description": "有了它，运动装置才得以可能，它可以以数种方式使相接的结构运动起来。", + "create.ponder.tag.kinetic_relays": "动力方块", + "create.ponder.tag.kinetic_relays.description": "用于传递旋转力的组件。", + "create.ponder.tag.contraption_actor": "装置执行组件", + "create.ponder.tag.contraption_actor.description": "能在移动的装置上执行特殊功能的组件", + "create.ponder.tag.creative": "创造模式", + "create.ponder.tag.creative.description": "总有些东西是生存模式得不到的。", + "create.ponder.tag.logistics": "物品运输", + "create.ponder.tag.logistics.description": "该组件可以协助物品运输", "create.ponder.adjustable_pulse_repeater.header": "使用可调节脉冲中继器控制信号发送", "create.ponder.adjustable_pulse_repeater.text_1": "可调节脉冲中继器在一段延时之后会发出一道短时脉冲", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json index 2ab510123..03574a0a8 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1504,41 +1504,41 @@ "create.ponder.categories": "Create 中的分類", "create.ponder.index_description": "點擊其中一個圖像查看和他相關的物品以及方塊", "create.ponder.index_title": "教學首頁", - "create.ponder.shared.movement_anchors": "有了機殼底盤和強力膠就可以移動大型結構", - "create.ponder.shared.rpm32": "32 RPM", - "create.ponder.shared.sneak_and": "潛行 +", - "create.ponder.shared.storage_on_contraption": "與結構相連的儲物空間會自動撿取物品", + "create.ponder.shared.rpm16": "16 RPM", "create.ponder.shared.behaviour_modify_wrench": "使用扳手來調整這個動作", + "create.ponder.shared.storage_on_contraption": "與結構相連的儲物空間會自動撿取物品", + "create.ponder.shared.sneak_and": "潛行 +", "create.ponder.shared.rpm8": "8 RPM", "create.ponder.shared.ctrl_and": "Ctrl +", + "create.ponder.shared.rpm32": "32 RPM", "create.ponder.shared.rpm16_source": "轉速: 16 RPM", - "create.ponder.shared.rpm16": "16 RPM", - "create.ponder.tag.kinetic_sources": "動能產生裝置", - "create.ponder.tag.kinetic_sources.description": "該裝置能夠產生動能", - "create.ponder.tag.contraption_actor": "特殊方塊", - "create.ponder.tag.contraption_actor.description": "附加到移動裝置上時表現出特殊行為的方塊", - "create.ponder.tag.arm_targets": "機械手臂的目標物", - "create.ponder.tag.arm_targets.description": "該裝置可作為機械手臂的工作目標", - "create.ponder.tag.logistics": "傳輸物品", - "create.ponder.tag.logistics.description": "該裝置用於物品的傳輸", - "create.ponder.tag.movement_anchor": "運動錨點", - "create.ponder.tag.movement_anchor.description": "允許建立移動裝置的元件，以各種方式為連接的結構設置動畫", - "create.ponder.tag.creative": "創造模式", - "create.ponder.tag.creative.description": "該裝置無法在生存模式中獲得", - "create.ponder.tag.kinetic_relays": "動能傳遞方塊", - "create.ponder.tag.kinetic_relays.description": "該裝置用於傳遞動能", - "create.ponder.tag.windmill_sails": "風車軸承的帆", - "create.ponder.tag.windmill_sails.description": "建造風車時用於產生動能的帆，每個帆對風車產生的效果都是同等的", - "create.ponder.tag.contraption_assembly": "方塊連接物件", - "create.ponder.tag.contraption_assembly.description": "此物件用於連接各個零件以便組成一個成品", - "create.ponder.tag.decoration": "裝飾", - "create.ponder.tag.decoration.description": "這些零件通常用於裝飾", - "create.ponder.tag.kinetic_appliances": "動能利用裝置", - "create.ponder.tag.kinetic_appliances.description": "這些裝置利用動能運作", + "create.ponder.shared.movement_anchors": "有了機殼底盤和強力膠就可以移動大型結構", "create.ponder.tag.redstone": "邏輯控制裝置", "create.ponder.tag.redstone.description": "這些裝置會在紅石電路中發揮用處", + "create.ponder.tag.contraption_assembly": "方塊連接物件", + "create.ponder.tag.contraption_assembly.description": "此物件用於連接各個零件以便組成一個成品", "create.ponder.tag.fluids": "液體控制裝置", "create.ponder.tag.fluids.description": "這些裝置可傳輸並利用液體", + "create.ponder.tag.decoration": "裝飾", + "create.ponder.tag.decoration.description": "這些零件通常用於裝飾", + "create.ponder.tag.windmill_sails": "風車軸承的帆", + "create.ponder.tag.windmill_sails.description": "建造風車時用於產生動能的帆，每個帆對風車產生的效果都是同等的", + "create.ponder.tag.arm_targets": "機械手臂的目標物", + "create.ponder.tag.arm_targets.description": "該裝置可作為機械手臂的工作目標", + "create.ponder.tag.kinetic_appliances": "動能利用裝置", + "create.ponder.tag.kinetic_appliances.description": "這些裝置利用動能運作", + "create.ponder.tag.kinetic_sources": "動能產生裝置", + "create.ponder.tag.kinetic_sources.description": "該裝置能夠產生動能", + "create.ponder.tag.movement_anchor": "運動錨點", + "create.ponder.tag.movement_anchor.description": "允許建立移動裝置的元件，以各種方式為連接的結構設置動畫", + "create.ponder.tag.kinetic_relays": "動能傳遞方塊", + "create.ponder.tag.kinetic_relays.description": "該裝置用於傳遞動能", + "create.ponder.tag.contraption_actor": "特殊方塊", + "create.ponder.tag.contraption_actor.description": "附加到移動裝置上時表現出特殊行為的方塊", + "create.ponder.tag.creative": "創造模式", + "create.ponder.tag.creative.description": "該裝置無法在生存模式中獲得", + "create.ponder.tag.logistics": "傳輸物品", + "create.ponder.tag.logistics.description": "該裝置用於物品的傳輸", "create.ponder.adjustable_pulse_repeater.header": "使用可調式脈衝中繼器來控制訊號", "create.ponder.adjustable_pulse_repeater.text_1": "可調式脈衝中繼器每次運作時會產生一個短脈衝", diff --git a/src/generated/resources/data/create/advancements/aesthetics.json b/src/generated/resources/data/create/advancements/aesthetics.json index d723cbe38..59a86f429 100644 --- a/src/generated/resources/data/create/advancements/aesthetics.json +++ b/src/generated/resources/data/create/advancements/aesthetics.json @@ -28,8 +28,8 @@ "trigger": "create:bracket_apply", "conditions": { "accepted_entries": [ - "create:cogwheel", - "create:large_cogwheel" + "create:large_cogwheel", + "create:cogwheel" ] } }, diff --git a/src/main/java/com/simibubi/create/AllFluids.java b/src/main/java/com/simibubi/create/AllFluids.java index d2b208839..25f5dacb0 100644 --- a/src/main/java/com/simibubi/create/AllFluids.java +++ b/src/main/java/com/simibubi/create/AllFluids.java @@ -23,8 +23,6 @@ import net.minecraftforge.common.Tags; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.ForgeFlowingFluid; -import net.minecraftforge.fluids.FluidAttributes.Builder; - public class AllFluids { private static final CreateRegistrate REGISTRATE = Create.registrate(); diff --git a/src/main/java/com/simibubi/create/AllRecipeTypes.java b/src/main/java/com/simibubi/create/AllRecipeTypes.java index d88471657..a15eda1e4 100644 --- a/src/main/java/com/simibubi/create/AllRecipeTypes.java +++ b/src/main/java/com/simibubi/create/AllRecipeTypes.java @@ -17,7 +17,6 @@ import com.simibubi.create.content.contraptions.fluids.actors.FillingRecipe; import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipeSerializer; import com.simibubi.create.content.contraptions.processing.BasinRecipe; import com.simibubi.create.content.contraptions.processing.EmptyingRecipe; -import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeFactory; import com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer; import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe; @@ -36,62 +35,56 @@ import net.minecraftforge.event.RegistryEvent; public enum AllRecipeTypes { MECHANICAL_CRAFTING(MechanicalCraftingRecipe.Serializer::new), - CONVERSION(processingSerializer(ConversionRecipe::new)), - CRUSHING(processingSerializer(CrushingRecipe::new)), - CUTTING(processingSerializer(CuttingRecipe::new)), - MILLING(processingSerializer(MillingRecipe::new)), - BASIN(processingSerializer(BasinRecipe::new)), - MIXING(processingSerializer(MixingRecipe::new)), - COMPACTING(processingSerializer(CompactingRecipe::new)), - PRESSING(processingSerializer(PressingRecipe::new)), - SANDPAPER_POLISHING(processingSerializer(SandPaperPolishingRecipe::new)), - SPLASHING(processingSerializer(SplashingRecipe::new)), - DEPLOYING(processingSerializer(DeployerApplicationRecipe::new)), - FILLING(processingSerializer(FillingRecipe::new)), - EMPTYING(processingSerializer(EmptyingRecipe::new)), + CONVERSION(ConversionRecipe::new), + CRUSHING(CrushingRecipe::new), + CUTTING(CuttingRecipe::new), + MILLING(MillingRecipe::new), + BASIN(BasinRecipe::new), + MIXING(MixingRecipe::new), + COMPACTING(CompactingRecipe::new), + PRESSING(PressingRecipe::new), + SANDPAPER_POLISHING(SandPaperPolishingRecipe::new), + SPLASHING(SplashingRecipe::new), + DEPLOYING(DeployerApplicationRecipe::new), + FILLING(FillingRecipe::new), + EMPTYING(EmptyingRecipe::new), SEQUENCED_ASSEMBLY(SequencedAssemblyRecipeSerializer::new), ; - public IRecipeSerializer serializer; - public Supplier> supplier; - public IRecipeType> type; + private ResourceLocation id; + private Supplier> serializerSupplier; + private Supplier> typeSupplier; + private IRecipeSerializer serializer; + private IRecipeType type; - AllRecipeTypes(Supplier> supplier) { - this(supplier, null); + AllRecipeTypes(Supplier> serializerSupplier, Supplier> typeSupplier) { + this.id = Create.asResource(Lang.asId(name())); + this.serializerSupplier = serializerSupplier; + this.typeSupplier = typeSupplier; } - AllRecipeTypes(Supplier> supplier, - IRecipeType> existingType) { - this.supplier = supplier; - this.type = existingType; + AllRecipeTypes(Supplier> serializerSupplier, IRecipeType existingType) { + this(serializerSupplier, () -> existingType); } - public static void register(RegistryEvent.Register> event) { - ShapedRecipe.setCraftingSize(9, 9); - - for (AllRecipeTypes r : AllRecipeTypes.values()) { - if (r.type == null) - r.type = customType(Lang.asId(r.name())); - - r.serializer = r.supplier.get(); - ResourceLocation location = new ResourceLocation(Create.ID, Lang.asId(r.name())); - event.getRegistry() - .register(r.serializer.setRegistryName(location)); - } + AllRecipeTypes(Supplier> serializerSupplier) { + this.id = Create.asResource(Lang.asId(name())); + this.serializerSupplier = serializerSupplier; + this.typeSupplier = () -> simpleType(id); } - private static > IRecipeType customType(String id) { - return Registry.register(Registry.RECIPE_TYPE, new ResourceLocation(Create.ID, id), new IRecipeType() { - public String toString() { - return Create.ID + ":" + id; - } - }); + AllRecipeTypes(ProcessingRecipeFactory processingFactory) { + this(processingSerializer(processingFactory)); } - private static Supplier> processingSerializer( - ProcessingRecipeFactory> factory) { - return () -> new ProcessingRecipeSerializer<>(factory); + public ResourceLocation getId() { + return id; + } + + @SuppressWarnings("unchecked") + public > T getSerializer() { + return (T) serializer; } @SuppressWarnings("unchecked") @@ -103,4 +96,30 @@ public enum AllRecipeTypes { return world.getRecipeManager() .getRecipeFor(getType(), inv, world); } + + public static void register(RegistryEvent.Register> event) { + ShapedRecipe.setCraftingSize(9, 9); + + for (AllRecipeTypes r : AllRecipeTypes.values()) { + r.serializer = r.serializerSupplier.get(); + r.type = r.typeSupplier.get(); + r.serializer.setRegistryName(r.id); + event.getRegistry() + .register(r.serializer); + } + } + + private static Supplier> processingSerializer(ProcessingRecipeFactory factory) { + return () -> new ProcessingRecipeSerializer<>(factory); + } + + public static > IRecipeType simpleType(ResourceLocation id) { + String stringId = id.toString(); + return Registry.register(Registry.RECIPE_TYPE, id, new IRecipeType() { + public String toString() { + return stringId; + } + }); + } + } diff --git a/src/main/java/com/simibubi/create/AllShapes.java b/src/main/java/com/simibubi/create/AllShapes.java index 234676ad0..9ba3acccd 100644 --- a/src/main/java/com/simibubi/create/AllShapes.java +++ b/src/main/java/com/simibubi/create/AllShapes.java @@ -241,7 +241,8 @@ public class AllShapes { } public static class Builder { - VoxelShape shape; + + private VoxelShape shape; public Builder(VoxelShape shape) { this.shape = shape; diff --git a/src/main/java/com/simibubi/create/AllSoundEvents.java b/src/main/java/com/simibubi/create/AllSoundEvents.java index 062ceb94a..77a60bbe4 100644 --- a/src/main/java/com/simibubi/create/AllSoundEvents.java +++ b/src/main/java/com/simibubi/create/AllSoundEvents.java @@ -10,7 +10,6 @@ import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.simibubi.create.foundation.utility.Couple; import com.simibubi.create.foundation.utility.Pair; @@ -242,7 +241,7 @@ public class AllSoundEvents { entry.prepare(); } - public static JsonElement provideLangEntries() { + public static JsonObject provideLangEntries() { JsonObject object = new JsonObject(); for (SoundEntry entry : entries.values()) if (entry.hasSubtitle()) diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index f4aa5f356..fecb6d893 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import com.jozufozu.flywheel.core.PartialModel; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher; import com.simibubi.create.content.contraptions.relays.encased.CasingConnectivity; diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java index 76b994322..4f7649478 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -179,7 +179,7 @@ public class CreateJEI implements IModPlugin { deploying = register("deploying", DeployingCategory::new) .recipeList( - () -> DeployerApplicationRecipe.convert(findRecipesByType(AllRecipeTypes.SANDPAPER_POLISHING.type))) + () -> DeployerApplicationRecipe.convert(findRecipesByType(AllRecipeTypes.SANDPAPER_POLISHING.getType()))) .recipes(AllRecipeTypes.DEPLOYING) .catalyst(AllBlocks.DEPLOYER::get) .catalyst(AllBlocks.DEPOT::get) @@ -205,7 +205,7 @@ public class CreateJEI implements IModPlugin { .recipes(r -> r.getSerializer() == IRecipeSerializer.SHAPELESS_RECIPE && r.getIngredients() .size() == 1) .recipes( - r -> (r.getType() == IRecipeType.CRAFTING && r.getType() != AllRecipeTypes.MECHANICAL_CRAFTING.type) + r -> (r.getType() == IRecipeType.CRAFTING && r.getType() != AllRecipeTypes.MECHANICAL_CRAFTING.getType()) && (r instanceof ShapedRecipe)) .catalyst(AllBlocks.MECHANICAL_CRAFTER::get) .enableWhen(c -> c.allowRegularCraftingInCrafter) diff --git a/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java b/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java index 90646791f..5732d4bff 100644 --- a/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java +++ b/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java @@ -17,8 +17,6 @@ import net.minecraft.client.renderer.Rectangle2d; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import mezz.jei.api.gui.handlers.IGhostIngredientHandler.Target; - @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public class GhostIngredientHandler> diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java index b58a1fffd..e3e1e4a0a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java @@ -11,8 +11,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraftforge.common.ToolType; -import net.minecraft.block.AbstractBlock.Properties; - public class CasingBlock extends Block implements IWrenchable { public CasingBlock(Properties p_i48440_1_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java index 5795ff7b2..b51c78b95 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java @@ -15,8 +15,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class DirectionalAxisKineticBlock extends DirectionalKineticBlock { public static final BooleanProperty AXIS_ALONG_FIRST_COORDINATE = BooleanProperty.create("axis_along_first"); diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java index 745948fa6..a95b29bda 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java @@ -12,8 +12,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class DirectionalKineticBlock extends KineticBlock { public static final DirectionProperty FACING = BlockStateProperties.FACING; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java index c627f5e15..1aceb4799 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java @@ -16,8 +16,6 @@ import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorldReader; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class HorizontalAxisKineticBlock extends KineticBlock { public static final Property HORIZONTAL_AXIS = BlockStateProperties.HORIZONTAL_AXIS; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java index c4b47d01a..fb844a7f9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java @@ -12,8 +12,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class HorizontalKineticBlock extends KineticBlock { public static final Property HORIZONTAL_FACING = BlockStateProperties.HORIZONTAL_FACING; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java index 351ece5f8..c2dc5f863 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java @@ -16,8 +16,6 @@ import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.common.ToolType; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class KineticBlock extends Block implements IRotate { protected static final Palette color = Palette.Red; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java index beb855895..16dbd32a3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java @@ -12,8 +12,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; import net.minecraft.util.Rotation; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class RotatedPillarKineticBlock extends KineticBlock { public static final EnumProperty AXIS = BlockStateProperties.AXIS; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorBlockItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorBlockItem.java index ea2eedcec..1a4e5d1b8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorBlockItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorBlockItem.java @@ -12,8 +12,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.item.Item.Properties; - public class AssemblyOperatorBlockItem extends BlockItem { public AssemblyOperatorBlockItem(Block block, Properties builder) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java index 3ad9dfa6d..827540eac 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java @@ -22,8 +22,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public abstract class AttachedActorBlock extends HorizontalBlock implements IWrenchable { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java index 65efab837..0e0a95fba 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java @@ -27,8 +27,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class DrillBlock extends DirectionalKineticBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java index 978928e91..8f6182917 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java @@ -6,8 +6,6 @@ import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; -import net.minecraft.block.AbstractBlock.Properties; - public class HarvesterBlock extends AttachedActorBlock { public HarvesterBlock(Properties p_i48377_1_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java index ce6d344d9..31a5ffad3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java @@ -7,8 +7,6 @@ import com.mojang.authlib.GameProfile; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.util.FakePlayer; -import net.minecraft.block.AbstractBlock.Properties; - public class PloughBlock extends AttachedActorBlock { public PloughBlock(Properties p_i48377_1_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableFluidInterfaceTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableFluidInterfaceTileEntity.java index 51de4cc00..1559bd22d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableFluidInterfaceTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableFluidInterfaceTileEntity.java @@ -10,8 +10,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.templates.FluidTank; -import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; - public class PortableFluidInterfaceTileEntity extends PortableStorageInterfaceTileEntity { protected LazyOptional capability; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java index 41263760d..6d93e5c95 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java @@ -18,8 +18,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class PortableStorageInterfaceBlock extends ProperDirectionalBlock diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java index 048ee7125..87ef62be5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java @@ -33,8 +33,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class SeatBlock extends Block { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java index 70b70d49c..a423fb7e7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java @@ -7,7 +7,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import mcp.MethodsReturnNonnullByDefault; -import net.minecraft.block.Block; +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Blocks; import net.minecraft.block.DispenserBlock; import net.minecraft.dispenser.DefaultDispenseItemBehavior; @@ -19,8 +19,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.block.AbstractBlock; - public class DispenserMovementBehaviour extends DropperMovementBehaviour { private static final HashMap MOVED_DISPENSE_ITEM_BEHAVIOURS = new HashMap<>(); private static final HashMap MOVED_PROJECTILE_DISPENSE_BEHAVIOURS = new HashMap<>(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java index 97d823099..9782accaf 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java @@ -20,8 +20,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -import net.minecraft.block.AbstractBlock.Properties; - public class CuckooClockBlock extends HorizontalKineticBlock { private boolean mysterious; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java index b4ef94055..d732ea2e2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java @@ -41,8 +41,6 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; -import net.minecraft.block.AbstractBlock.Properties; - public class MechanicalCrafterBlock extends HorizontalKineticBlock implements ITE, ICogWheel { public static final EnumProperty POINTING = EnumProperty.create("pointing", Pointing.class); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java index 6ee3fb525..2022cccf2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java @@ -33,17 +33,17 @@ public class MechanicalCraftingRecipe extends ShapedRecipe { @Override public IRecipeType getType() { - return AllRecipeTypes.MECHANICAL_CRAFTING.type; + return AllRecipeTypes.MECHANICAL_CRAFTING.getType(); } - + @Override public boolean isSpecial() { return true; } - + @Override public IRecipeSerializer getSerializer() { - return AllRecipeTypes.MECHANICAL_CRAFTING.serializer; + return AllRecipeTypes.MECHANICAL_CRAFTING.getSerializer(); } public static class Serializer extends ShapedRecipe.Serializer { @@ -52,7 +52,7 @@ public class MechanicalCraftingRecipe extends ShapedRecipe { public ShapedRecipe fromJson(ResourceLocation recipeId, JsonObject json) { return fromShaped(super.fromJson(recipeId, json)); } - + @Override public ShapedRecipe fromNetwork(ResourceLocation recipeId, PacketBuffer buffer) { return fromShaped(super.fromNetwork(recipeId, buffer)); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java index 601de50ad..916e384b0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java @@ -29,8 +29,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.block.AbstractBlock.Properties; - public class HandCrankBlock extends DirectionalKineticBlock implements ITE { public HandCrankBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java index 7698e17af..7d0b97fe8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java @@ -20,8 +20,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault public class ValveHandleBlock extends HandCrankBlock { private final boolean inCreativeTab; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java index de5526d9e..c0afc346b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java @@ -25,8 +25,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE { public CrushingWheelBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java index 686d13d2b..3184f7f3b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java @@ -37,8 +37,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class CrushingWheelControllerBlock extends DirectionalBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java index 5485dd542..d6bc343a6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java @@ -31,8 +31,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class DeployerBlock extends DirectionalAxisKineticBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java index 79f244a1d..6cd3cc491 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java @@ -19,8 +19,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class EncasedFanBlock extends DirectionalKineticBlock implements ITE { public EncasedFanBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java index ed9b2fb73..dc943711a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java @@ -22,8 +22,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public class NozzleBlock extends ProperDirectionalBlock { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java index 453b74a35..71762f6fa 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java @@ -23,8 +23,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class FlywheelBlock extends HorizontalKineticBlock { public static EnumProperty CONNECTION = EnumProperty.create("connection", ConnectionState.class); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java index a817af1aa..483c3f0da 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java @@ -22,8 +22,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class EngineBlock extends HorizontalBlock implements IWrenchable { protected EngineBlock(Properties builder) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java index 9ae752b75..43eb4ee7c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java @@ -15,7 +15,6 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java index fe251a7ba..6c034f883 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java @@ -24,8 +24,6 @@ import net.minecraftforge.eventbus.api.Event.Result; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraft.block.AbstractBlock.Properties; - @EventBusSubscriber public class FurnaceEngineBlock extends EngineBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java index b2d2cf56d..e880796ce 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java @@ -32,8 +32,6 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; -import net.minecraft.block.AbstractBlock.Properties; - public class MillstoneBlock extends KineticBlock implements ITE, ICogWheel { public MillstoneBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java index 0e80f176c..5e618fef9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java @@ -19,9 +19,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel; -import net.minecraft.block.AbstractBlock.Properties; - public class MechanicalMixerBlock extends KineticBlock implements ITE, ICogWheel { public MechanicalMixerBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java index 89324dcf5..51c803a0a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java @@ -229,7 +229,7 @@ public class MechanicalMixerTileEntity extends BasinOperatingTileEntity { return ((r.getSerializer() == IRecipeSerializer.SHAPELESS_RECIPE && AllConfigs.SERVER.recipes.allowShapelessInMixer.get() && r.getIngredients() .size() > 1) - || r.getType() == AllRecipeTypes.MIXING.type); + || r.getType() == AllRecipeTypes.MIXING.getType()); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlock.java index 037947564..0d137fe2e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlock.java @@ -16,8 +16,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -import net.minecraft.block.AbstractBlock.Properties; - public class CreativeMotorBlock extends DirectionalKineticBlock { public CreativeMotorBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java index d4ca80567..e05d44501 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java @@ -19,8 +19,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -import net.minecraft.block.AbstractBlock.Properties; - public class MechanicalPressBlock extends HorizontalKineticBlock implements ITE { public MechanicalPressBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java index 38b639cc7..2d428cc6c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java @@ -346,7 +346,7 @@ public class MechanicalPressTileEntity extends BasinOperatingTileEntity { @Override protected boolean matchStaticFilters(IRecipe recipe) { return (recipe instanceof ICraftingRecipe && canCompress(recipe.getIngredients())) - || recipe.getType() == AllRecipeTypes.COMPACTING.type; + || recipe.getType() == AllRecipeTypes.COMPACTING.getType(); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java index 30aa20e8f..cebba49a6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java @@ -30,8 +30,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class SawBlock extends DirectionalAxisKineticBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java index 3c2dcc97a..f49dea4c7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java @@ -55,8 +55,6 @@ import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.fml.network.PacketDistributor; -import net.minecraft.entity.Entity.IMoveCallback; - public abstract class AbstractContraptionEntity extends Entity implements IEntityAdditionalSpawnData { private static final DataParameter STALLED = diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java index be07bba20..d2060e248 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java @@ -22,8 +22,6 @@ import net.minecraft.world.gen.feature.template.Template.BlockInfo; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity.ContraptionRotationState; - /** * Ex: Pistons, bearings
* Controlled Contraption Entities can rotate around one axis and translate. diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java index d78fe1f53..9210605e5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java @@ -48,8 +48,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.util.LazyOptional; -import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity.ContraptionRotationState; - /** * Ex: Minecarts, Couplings
* Oriented Contraption Entities can rotate freely around two axes diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java index bfd702852..daa19daa7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java @@ -11,8 +11,6 @@ import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorldReader; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class BearingBlock extends DirectionalKineticBlock { public BearingBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java index eb84c4af1..240e1a23f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java @@ -14,8 +14,6 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class ClockworkBearingBlock extends BearingBlock implements ITE { public ClockworkBearingBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java index 6114db22d..005f57692 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java @@ -13,8 +13,6 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class MechanicalBearingBlock extends BearingBlock implements ITE { public MechanicalBearingBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java index 7c90fcc94..650fda752 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java @@ -27,8 +27,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.ITextComponent; -import com.simibubi.create.content.contraptions.components.structureMovement.IControlContraption.RotationMode; - public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity implements IBearingTileEntity, IDisplayAssemblyExceptions { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java index bdee280ce..73fd3b67e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java @@ -41,8 +41,6 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class SailBlock extends ProperDirectionalBlock { public static SailBlock frame(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlock.java index f6a82f784..0c6e037f9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlock.java @@ -13,8 +13,6 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class WindmillBearingBlock extends BearingBlock implements ITE { public WindmillBearingBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java index 4fc5cdaee..7ba1ceba3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java @@ -25,8 +25,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.common.Tags; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class AbstractChassisBlock extends RotatedPillarBlock implements IWrenchable { public AbstractChassisBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java index cc648fd20..3c35b4573 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java @@ -18,8 +18,6 @@ import net.minecraft.world.IBlockDisplayReader; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class LinearChassisBlock extends AbstractChassisBlock { public static final BooleanProperty STICKY_TOP = BooleanProperty.create("sticky_top"); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java index 9231de81b..a54bc4c65 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java @@ -7,8 +7,6 @@ import net.minecraft.state.StateContainer.Builder; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; -import net.minecraft.block.AbstractBlock.Properties; - public class RadialChassisBlock extends AbstractChassisBlock { public static final BooleanProperty STICKY_NORTH = BooleanProperty.create("sticky_north"); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlock.java index 126f1722a..ba22c9f79 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlock.java @@ -25,8 +25,6 @@ import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class StickerBlock extends ProperDirectionalBlock implements ITE { public static final BooleanProperty POWERED = BlockStateProperties.POWERED; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerTileEntity.java index 8b2a039c6..6e85209da 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerTileEntity.java @@ -18,7 +18,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java index f969f3840..1c818a8ca 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java @@ -24,8 +24,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class GantryCarriageBlock extends DirectionalAxisKineticBlock implements ITE { public GantryCarriageBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionEntity.java index bcf52fedb..c49b3bbe1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionEntity.java @@ -28,8 +28,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.network.PacketDistributor; -import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity.ContraptionRotationState; - public class GantryContraptionEntity extends AbstractContraptionEntity { Direction movementAxis; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java index 7cbd56b8f..99811ca53 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java @@ -20,8 +20,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.item.Item.Properties; - public class SuperGlueItem extends Item { public SuperGlueItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java index 18ffa2a3d..230c858a2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java @@ -57,8 +57,6 @@ import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class CartAssemblerBlock extends AbstractRailBlock implements ITE, IWrenchable, ISpecialBlockItemRequirement { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockItem.java index cb597bab5..e8678801f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockItem.java @@ -21,8 +21,6 @@ import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.item.Item.Properties; - public class CartAssemblerBlockItem extends BlockItem { public CartAssemblerBlockItem(Block block, Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java index 8e88ff2a5..1f40b822f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java @@ -46,8 +46,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraft.item.Item.Properties; - @EventBusSubscriber public class MinecartContraptionItem extends Item { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java index 959dcc4cf..faec44b37 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java @@ -35,8 +35,6 @@ import net.minecraft.world.gen.feature.template.Template.BlockInfo; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.InvWrapper; -import com.simibubi.create.content.contraptions.components.structureMovement.Contraption.ContraptionInvWrapper; - public class MountedContraption extends Contraption { public CartMovementMode rotationMode; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java index bb4962679..a4f3b1671 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java @@ -21,8 +21,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; -import com.simibubi.create.content.contraptions.components.structureMovement.IControlContraption.MovementMode; - public abstract class LinearActuatorTileEntity extends KineticTileEntity implements IControlContraption, IDisplayAssemblyExceptions { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java index 04d12e65b..b936f8814 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java @@ -35,8 +35,6 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.Tags; -import net.minecraft.block.AbstractBlock.Properties; - public class MechanicalPistonBlock extends DirectionalAxisKineticBlock implements ITE { public static final EnumProperty STATE = EnumProperty.create("state", PistonState.class); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java index 0b8e4553c..ac665c58f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java @@ -30,8 +30,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class MechanicalPistonHeadBlock extends ProperDirectionalBlock implements IWaterLoggable { public static final EnumProperty TYPE = BlockStateProperties.PISTON_TYPE; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java index 658c60781..79f82e7f4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java @@ -44,8 +44,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraftforge.common.ToolType; -import net.minecraft.block.AbstractBlock.Properties; - public class PistonExtensionPoleBlock extends ProperDirectionalBlock implements IWrenchable, IWaterLoggable { private static final int placementHelperId = PlacementHelpers.register(PlacementHelper.get()); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java index aafc9c3e2..c482ac605 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java @@ -33,8 +33,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class PulleyBlock extends HorizontalAxisKineticBlock implements ITE { public static EnumProperty HORIZONTAL_AXIS = BlockStateProperties.HORIZONTAL_AXIS; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java index aaff598e0..d41c688ef 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java @@ -13,9 +13,6 @@ import static org.lwjgl.opengl.GL20.glUseProgram; import java.util.List; import java.util.Random; -import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter; -import com.simibubi.create.foundation.config.AllConfigs; - import org.apache.commons.lang3.tuple.Pair; import com.jozufozu.flywheel.backend.Backend; @@ -28,8 +25,10 @@ import com.simibubi.create.AllMovementBehaviours; import com.simibubi.create.CreateClient; import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter; import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.render.AllProgramSpecs; import com.simibubi.create.foundation.render.Compartment; import com.simibubi.create.foundation.render.CreateContexts; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java index 9b839a131..737f4a828 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java @@ -22,8 +22,6 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraft.item.Item.Properties; - @EventBusSubscriber public class MinecartCouplingItem extends Item { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailBlock.java index acb0c8c20..2b744df9c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailBlock.java @@ -39,8 +39,6 @@ import net.minecraft.util.math.vector.Vector3i; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class ControllerRailBlock extends AbstractRailBlock implements IWrenchable { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java index e6b0e662f..22eb42a2d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java @@ -25,8 +25,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class ReinforcedRailBlock extends AbstractRailBlock { public static Property RAIL_SHAPE = diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java index 9db909491..f4cbc379f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java @@ -25,8 +25,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class TurntableBlock extends KineticBlock implements ITE { public TurntableBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java index 30f644fef..8d62bc67c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java @@ -32,8 +32,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class WaterWheelBlock extends DirectionalKineticBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidBottleItemHook.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidBottleItemHook.java index 16df63210..211e5964a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidBottleItemHook.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidBottleItemHook.java @@ -18,8 +18,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraft.item.Item.Properties; - @EventBusSubscriber public class FluidBottleItemHook extends Item { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java index f412b03d9..4476c585c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java @@ -38,8 +38,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.templates.FluidTank; -import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; - public class OpenEndedPipe extends FlowSource { World world; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java index 9c40cd741..d660caedc 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java @@ -32,8 +32,6 @@ import net.minecraft.world.TickPriority; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class PumpBlock extends DirectionalKineticBlock implements IWaterLoggable, ICogWheel { public PumpBlock(Properties p_i48415_1_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpTileEntity.java index a1143ffc5..ff46cfa22 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpTileEntity.java @@ -35,8 +35,6 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour.AttachmentTypes; - public class PumpTileEntity extends KineticTileEntity { LerpedFloat arrowDirection; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/VirtualFluid.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/VirtualFluid.java index 6affc6d7b..c7b5c930c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/VirtualFluid.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/VirtualFluid.java @@ -8,8 +8,6 @@ import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraftforge.fluids.ForgeFlowingFluid; -import net.minecraftforge.fluids.ForgeFlowingFluid.Properties; - public class VirtualFluid extends ForgeFlowingFluid { public VirtualFluid(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidDrainingBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidDrainingBehaviour.java index 3ebbd9e83..73d864880 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidDrainingBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidDrainingBehaviour.java @@ -28,8 +28,6 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import com.simibubi.create.content.contraptions.fluids.actors.FluidManipulationBehaviour.BlockPosEntry; - public class FluidDrainingBehaviour extends FluidManipulationBehaviour { Fluid fluid; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java index 0ad365d4c..7ac14a5e9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java @@ -39,8 +39,6 @@ import net.minecraft.world.NextTickListEntry; import net.minecraft.world.World; import net.minecraft.world.server.ServerTickList; -import com.simibubi.create.content.contraptions.fluids.actors.FluidManipulationBehaviour.BlockPosEntry; - public class FluidFillingBehaviour extends FluidManipulationBehaviour { PriorityQueue queue; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlock.java index 19635c8d8..b79cfc316 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlock.java @@ -20,8 +20,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class HosePulleyBlock extends HorizontalKineticBlock implements ITE { public HosePulleyBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyFluidHandler.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyFluidHandler.java index 3ec633eac..86837a340 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyFluidHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyFluidHandler.java @@ -11,8 +11,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; - public class HosePulleyFluidHandler implements IFluidHandler { // The dynamic interface diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java index 0a7a13fdd..b8ce936c3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java @@ -25,8 +25,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class ItemDrainBlock extends Block implements IWrenchable, ITE { public ItemDrainBlock(Properties p_i48440_1_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlock.java index 2d5634321..30ea3345e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlock.java @@ -15,8 +15,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class SpoutBlock extends Block implements IWrenchable { public SpoutBlock(Properties p_i48440_1_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidParticleData.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidParticleData.java index 1e2b7a503..b1ee8f926 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidParticleData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidParticleData.java @@ -21,8 +21,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.registries.ForgeRegistries; -import net.minecraft.particles.IParticleData.IDeserializer; - public class FluidParticleData implements IParticleData, ICustomParticleData { private ParticleType type; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/AxisPipeBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/AxisPipeBlock.java index 1ea8c401f..76ec1811d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/AxisPipeBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/AxisPipeBlock.java @@ -38,8 +38,6 @@ import net.minecraft.world.TickPriority; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class AxisPipeBlock extends RotatedPillarBlock implements IWrenchableWithBracket, IAxisPipe { public AxisPipeBlock(Properties p_i48339_1_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlock.java index df522f4dc..9a096c2f9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlock.java @@ -19,8 +19,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; import net.minecraft.util.IStringSerializable; -import net.minecraft.block.AbstractBlock.Properties; - public class BracketBlock extends ProperDirectionalBlock { public static final BooleanProperty AXIS_ALONG_FIRST_COORDINATE = diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlockItem.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlockItem.java index 243f3a31b..b636ce1f6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlockItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlockItem.java @@ -17,8 +17,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.item.Item.Properties; - public class BracketBlockItem extends BlockItem { public BracketBlockItem(Block p_i48527_1_, Properties p_i48527_2_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/EncasedPipeBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/EncasedPipeBlock.java index be375a2dc..e668ab22c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/EncasedPipeBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/EncasedPipeBlock.java @@ -38,8 +38,6 @@ import net.minecraft.world.TickPriority; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class EncasedPipeBlock extends Block implements IWrenchable, ISpecialBlockItemRequirement { public static final Map FACING_TO_PROPERTY_MAP = SixWayBlock.PROPERTY_BY_DIRECTION; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java index a42ef87b3..8f4c9b6b7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java @@ -46,8 +46,6 @@ import net.minecraft.world.TickPriority; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class FluidPipeBlock extends SixWayBlock implements IWaterLoggable, IWrenchableWithBracket { public FluidPipeBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeTileEntity.java index bc630c4aa..0b34ef02e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeTileEntity.java @@ -15,8 +15,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockDisplayReader; -import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour.AttachmentTypes; - public class FluidPipeTileEntity extends SmartTileEntity { public FluidPipeTileEntity(TileEntityType tileEntityTypeIn) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlock.java index 16faae839..d2395c2c6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlock.java @@ -28,8 +28,6 @@ import net.minecraft.world.TickPriority; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class FluidValveBlock extends DirectionalAxisKineticBlock implements IAxisPipe { public static final BooleanProperty ENABLED = BooleanProperty.create("enabled"); diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/GlassFluidPipeBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/GlassFluidPipeBlock.java index 7680aa163..b1a4729f2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/GlassFluidPipeBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/GlassFluidPipeBlock.java @@ -26,9 +26,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; - -import net.minecraft.block.AbstractBlock.Properties; - @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public class GlassFluidPipeBlock extends AxisPipeBlock implements IWaterLoggable, ISpecialBlockItemRequirement { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlock.java index 17058c21b..86b64da1c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlock.java @@ -28,8 +28,6 @@ import net.minecraft.world.TickPriority; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class SmartFluidPipeBlock extends HorizontalFaceBlock implements IAxisPipe { public SmartFluidPipeBlock(Properties p_i48339_1_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java index 56c9ba2b0..c8d365642 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java @@ -15,8 +15,6 @@ import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockDisplayReader; -import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour.AttachmentTypes; - public class StraightPipeTileEntity extends SmartTileEntity { public StraightPipeTileEntity(TileEntityType tileEntityTypeIn) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java index 8f45f10d1..d65ffb09a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java @@ -20,9 +20,6 @@ import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.fluids.FluidAttributes.Builder; -import net.minecraftforge.fluids.ForgeFlowingFluid.Properties; - public class PotionFluid extends VirtualFluid { public enum BottleType { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/CreativeFluidTankTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/CreativeFluidTankTileEntity.java index 2dcff2dc9..e5bf6f58a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/CreativeFluidTankTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/CreativeFluidTankTileEntity.java @@ -9,8 +9,6 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; - public class CreativeFluidTankTileEntity extends FluidTankTileEntity { public CreativeFluidTankTileEntity(TileEntityType tileEntityTypeIn) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlock.java index 3b4068981..0ad417194 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlock.java @@ -47,8 +47,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraft.block.AbstractBlock.Properties; - public class FluidTankBlock extends Block implements IWrenchable, ITE { public static final BooleanProperty TOP = BooleanProperty.create("top"); diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java index 3687fcf89..348fbcb45 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java @@ -14,8 +14,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import net.minecraft.item.Item.Properties; - public class FluidTankItem extends BlockItem { public FluidTankItem(Block p_i48527_1_, Properties p_i48527_2_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java index 09c31ad95..f85c88d8a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java @@ -14,8 +14,6 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.world.World; -import net.minecraft.item.Item.Properties; - public class GogglesItem extends Item { public GogglesItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java b/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java index f3cb49835..fa37002d0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java @@ -9,8 +9,6 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; -import net.minecraft.item.Item.Properties; - public class SequencedAssemblyItem extends Item { public SequencedAssemblyItem(Properties p_i48487_1_) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeBuilder.java b/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeBuilder.java index 9453108aa..f65cbdfc0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeBuilder.java +++ b/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeBuilder.java @@ -34,7 +34,7 @@ public class SequencedAssemblyRecipeBuilder { public SequencedAssemblyRecipeBuilder(ResourceLocation id) { recipeConditions = new ArrayList<>(); this.recipe = new SequencedAssemblyRecipe(id, - (SequencedAssemblyRecipeSerializer) AllRecipeTypes.SEQUENCED_ASSEMBLY.serializer); + AllRecipeTypes.SEQUENCED_ASSEMBLY.getSerializer()); } public > SequencedAssemblyRecipeBuilder addStep(ProcessingRecipeFactory factory, diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java b/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java index af874fb00..bff77492d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java @@ -16,8 +16,6 @@ import net.minecraft.util.math.vector.Vector3i; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.particles.IParticleData.IDeserializer; - public class AirFlowParticleData implements IParticleData, ICustomParticleDataWithSprite { public static final Codec CODEC = RecordCodecBuilder.create(i -> diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticleData.java b/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticleData.java index 9f214547d..133dc3180 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticleData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticleData.java @@ -15,8 +15,6 @@ import net.minecraft.particles.ParticleType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.particles.IParticleData.IDeserializer; - public class AirParticleData implements IParticleData, ICustomParticleDataWithSprite { public static final Codec CODEC = RecordCodecBuilder.create(i -> diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java b/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java index 39c21b7b9..7bf66ce3c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java @@ -15,8 +15,6 @@ import net.minecraft.particles.ParticleType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.particles.IParticleData.IDeserializer; - public class CubeParticleData implements IParticleData, ICustomParticleData { public static final Codec CODEC = RecordCodecBuilder.create(i -> diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticleData.java b/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticleData.java index a9a08dfba..c2cf4c37e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticleData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticleData.java @@ -18,8 +18,6 @@ import net.minecraft.particles.ParticleType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.particles.IParticleData.IDeserializer; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class HeaterParticleData implements IParticleData, ICustomParticleDataWithSprite { diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticleData.java b/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticleData.java index f69c5f031..2827b49a8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticleData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticleData.java @@ -19,8 +19,6 @@ import net.minecraft.util.Direction.Axis; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.particles.IParticleData.IDeserializer; - public class RotationIndicatorParticleData implements IParticleData, ICustomParticleDataWithSprite { diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlock.java b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlock.java index 61ada67e1..673115935 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlock.java @@ -48,8 +48,6 @@ import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; -import net.minecraft.block.AbstractBlock.Properties; - public class BasinBlock extends Block implements ITE, IWrenchable { public static final DirectionProperty FACING = BlockStateProperties.FACING_HOPPER; diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipe.java index 4f4dff700..d92235e4c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipe.java @@ -52,10 +52,10 @@ public abstract class ProcessingRecipe implements IRecipe< this.processingDuration = params.processingDuration; this.fluidIngredients = params.fluidIngredients; this.fluidResults = params.fluidResults; - this.serializer = recipeType.serializer; + this.serializer = recipeType.getSerializer(); this.requiredHeat = params.requiredHeat; this.ingredients = params.ingredients; - this.type = recipeType.type; + this.type = recipeType.getType(); this.results = params.results; this.id = params.id; diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java index 5099023e8..e81f6e0f7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java @@ -192,15 +192,15 @@ public class ProcessingRecipeBuilder> { public static class ProcessingRecipeParams { - ResourceLocation id; - NonNullList ingredients; - NonNullList results; - NonNullList fluidIngredients; - NonNullList fluidResults; - int processingDuration; - HeatCondition requiredHeat; + protected ResourceLocation id; + protected NonNullList ingredients; + protected NonNullList results; + protected NonNullList fluidIngredients; + protected NonNullList fluidResults; + protected int processingDuration; + protected HeatCondition requiredHeat; - ProcessingRecipeParams(ResourceLocation id) { + protected ProcessingRecipeParams(ResourceLocation id) { this.id = id; ingredients = NonNullList.create(); results = NonNullList.create(); @@ -226,7 +226,7 @@ public class ProcessingRecipeBuilder> { String typeName = Lang.asId(recipeType.name()); this.recipe = recipe; - if (!(recipeType.serializer instanceof ProcessingRecipeSerializer)) + if (!(recipeType.getSerializer() instanceof ProcessingRecipeSerializer)) throw new IllegalStateException("Cannot datagen ProcessingRecipe of type: " + typeName); this.id = new ResourceLocation(recipe.getId().getNamespace(), diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockItem.java b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockItem.java index f09197d66..8e033b5b5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockItem.java @@ -36,8 +36,6 @@ import net.minecraft.world.World; import net.minecraft.world.spawner.AbstractSpawner; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import net.minecraft.item.Item.Properties; - @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public class BlazeBurnerBlockItem extends BlockItem { diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java index c0d9fa4fa..f81829625 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java @@ -31,8 +31,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ToolType; -import net.minecraft.block.AbstractBlock.Properties; - public class LitBlazeBurnerBlock extends Block { public static final EnumProperty FLAME_TYPE = EnumProperty.create("flame_type", FlameType.class); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlock.java index 3219d900b..a05ec6708 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlock.java @@ -45,8 +45,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class GantryShaftBlock extends DirectionalKineticBlock { public static final Property PART = EnumProperty.create("part", Part.class); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java index 2c2be6f0e..c0838a5c9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java @@ -33,8 +33,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class SpeedControllerBlock extends HorizontalAxisKineticBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java index 3389e3b56..f66821680 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java @@ -36,8 +36,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; -import net.minecraft.block.AbstractBlock.Properties; - public class SequencedGearshiftBlock extends HorizontalAxisKineticBlock implements ITE { public static final BooleanProperty VERTICAL = BooleanProperty.create("vertical"); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java index a10935923..d72e079f6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java @@ -76,8 +76,6 @@ import net.minecraftforge.common.Tags; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import net.minecraft.block.AbstractBlock.Properties; - public class BeltBlock extends HorizontalKineticBlock implements ITE, ISpecialBlockItemRequirement { public static final Property SLOPE = EnumProperty.create("slope", BeltSlope.class); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorItem.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorItem.java index 733031c90..e9f63918c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorItem.java @@ -34,8 +34,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.item.Item.Properties; - public class BeltConnectorItem extends BlockItem { public BeltConnectorItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/AbstractShaftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/AbstractShaftBlock.java index 6e74032a9..992bb5a84 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/AbstractShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/AbstractShaftBlock.java @@ -30,8 +30,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class AbstractShaftBlock extends RotatedPillarKineticBlock implements IWaterLoggable, IWrenchableWithBracket { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java index 7df1faa2f..b22bb9457 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java @@ -23,8 +23,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @SuppressWarnings("deprecation") diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogwheelBlockItem.java b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogwheelBlockItem.java index 60b44226c..23b34992a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogwheelBlockItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogwheelBlockItem.java @@ -29,8 +29,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; -import net.minecraft.item.Item.Properties; - public class CogwheelBlockItem extends BlockItem { boolean large; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java index e169a93e8..c00d1a77f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java @@ -26,8 +26,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class ShaftBlock extends AbstractShaftBlock { private static final int placementHelperId = PlacementHelpers.register(new PlacementHelper()); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AbstractEncasedShaftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AbstractEncasedShaftBlock.java index 7c7c7ea29..2dcbf534f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AbstractEncasedShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AbstractEncasedShaftBlock.java @@ -14,8 +14,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorldReader; -import net.minecraft.block.AbstractBlock.Properties; - @MethodsReturnNonnullByDefault public abstract class AbstractEncasedShaftBlock extends RotatedPillarKineticBlock { public AbstractEncasedShaftBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java index e2f5b841f..54b44f711 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java @@ -14,8 +14,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class AdjustablePulleyBlock extends EncasedBeltBlock implements ITE { public static BooleanProperty POWERED = BlockStateProperties.POWERED; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ClutchBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ClutchBlock.java index e9dc87580..f0beb78ac 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ClutchBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ClutchBlock.java @@ -9,8 +9,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class ClutchBlock extends GearshiftBlock { public ClutchBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedBeltBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedBeltBlock.java index 4f01db3ee..eb7a15205 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedBeltBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedBeltBlock.java @@ -27,8 +27,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; -import net.minecraft.block.AbstractBlock.Properties; - public class EncasedBeltBlock extends RotatedPillarKineticBlock { public static final Property PART = EnumProperty.create("part", Part.class); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java index f4a3ed011..7ff8a064f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java @@ -15,8 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; import net.minecraft.world.IBlockReader; -import net.minecraft.block.AbstractBlock.Properties; - public class EncasedShaftBlock extends AbstractEncasedShaftBlock implements ISpecialBlockItemRequirement { private BlockEntry casing; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/GearshiftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/GearshiftBlock.java index c907cbbd0..c96a2cb6d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/GearshiftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/GearshiftBlock.java @@ -21,8 +21,6 @@ import net.minecraft.world.TickPriority; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class GearshiftBlock extends AbstractEncasedShaftBlock implements ITE { public static final BooleanProperty POWERED = BlockStateProperties.POWERED; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java index 71bb136d7..57c489955 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java @@ -29,8 +29,6 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class GaugeBlock extends DirectionalAxisKineticBlock { public static final GaugeShaper GAUGE = GaugeShaper.make(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java index bf75f70ed..83a2a74a9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java @@ -23,8 +23,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -import net.minecraft.block.AbstractBlock.Properties; - public class GearboxBlock extends RotatedPillarKineticBlock { public GearboxBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/VerticalGearboxItem.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/VerticalGearboxItem.java index 5fea417ea..23832729b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/VerticalGearboxItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/VerticalGearboxItem.java @@ -20,8 +20,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.item.Item.Properties; - public class VerticalGearboxItem extends BlockItem { public VerticalGearboxItem(Properties builder) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java b/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java index 057738739..79131ad98 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java @@ -22,8 +22,6 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.event.entity.player.AttackEntityEvent; -import net.minecraft.item.Item.Properties; - public class WrenchItem extends Item { public WrenchItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/BuildersTeaItem.java b/src/main/java/com/simibubi/create/content/curiosities/BuildersTeaItem.java index da273627e..46791ab15 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/BuildersTeaItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/BuildersTeaItem.java @@ -15,8 +15,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.world.World; -import net.minecraft.item.Item.Properties; - public class BuildersTeaItem extends Item { public BuildersTeaItem(Properties p_i48487_1_) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java index 0c32dbb7a..9e0cb506f 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java @@ -27,8 +27,6 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraft.world.gen.Heightmap; -import net.minecraft.item.Item.Properties; - public class ChromaticCompoundItem extends Item { public ChromaticCompoundItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/CombustibleItem.java b/src/main/java/com/simibubi/create/content/curiosities/CombustibleItem.java index caaed78ae..a92cb727d 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/CombustibleItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/CombustibleItem.java @@ -3,8 +3,6 @@ package com.simibubi.create.content.curiosities; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.Item.Properties; - public class CombustibleItem extends Item { private int burnTime = -1; diff --git a/src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java b/src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java index 0a41070cf..328164c20 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java @@ -11,8 +11,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; -import net.minecraft.item.Item.Properties; - public class NoGravMagicalDohickyItem extends Item { public NoGravMagicalDohickyItem(Properties p_i48487_1_) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/RefinedRadianceItem.java b/src/main/java/com/simibubi/create/content/curiosities/RefinedRadianceItem.java index 1712ae8d0..3cb9584e7 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/RefinedRadianceItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/RefinedRadianceItem.java @@ -4,8 +4,6 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.item.Item.Properties; - public class RefinedRadianceItem extends NoGravMagicalDohickyItem { public RefinedRadianceItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/ShadowSteelItem.java b/src/main/java/com/simibubi/create/content/curiosities/ShadowSteelItem.java index 96b1c5548..9f59e52c8 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/ShadowSteelItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/ShadowSteelItem.java @@ -4,8 +4,6 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.MathHelper; -import net.minecraft.item.Item.Properties; - public class ShadowSteelItem extends NoGravMagicalDohickyItem { public ShadowSteelItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java b/src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java index f9bdccf0f..dc4725be6 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java @@ -13,8 +13,6 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.server.ServerWorld; -import net.minecraft.item.Item.Properties; - public class TreeFertilizerItem extends Item { public TreeFertilizerItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/CapacityEnchantment.java b/src/main/java/com/simibubi/create/content/curiosities/armor/CapacityEnchantment.java index da5c2dc37..49b31df0d 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/CapacityEnchantment.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/CapacityEnchantment.java @@ -5,8 +5,6 @@ import net.minecraft.enchantment.EnchantmentType; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; -import net.minecraft.enchantment.Enchantment.Rarity; - public class CapacityEnchantment extends Enchantment { public CapacityEnchantment(Rarity p_i46731_1_, EnchantmentType p_i46731_2_, EquipmentSlotType[] p_i46731_3_) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/CopperArmorItem.java b/src/main/java/com/simibubi/create/content/curiosities/armor/CopperArmorItem.java index df735ef18..3b8274e37 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/CopperArmorItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/CopperArmorItem.java @@ -7,8 +7,6 @@ import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ArmorItem; import net.minecraft.item.ItemStack; -import net.minecraft.item.Item.Properties; - public class CopperArmorItem extends ArmorItem { public CopperArmorItem(EquipmentSlotType p_i48534_2_, Properties p_i48534_3_) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankBlock.java b/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankBlock.java index a483f7560..40ae701ba 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankBlock.java @@ -44,8 +44,6 @@ import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; -import net.minecraft.block.AbstractBlock.Properties; - public class CopperBacktankBlock extends HorizontalKineticBlock implements ITE, IWaterLoggable { diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankItem.java b/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankItem.java index 3fa0f3065..81df65440 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankItem.java @@ -12,8 +12,6 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; -import net.minecraft.item.Item.Properties; - public class CopperBacktankItem extends CopperArmorItem implements ICapacityEnchantable { public static final int DURABILITY_BAR = 0xefefef; diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java b/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java index fa47be38b..bde20ed32 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java @@ -13,8 +13,6 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import net.minecraft.item.Item.Properties; - @EventBusSubscriber public class DivingBootsItem extends CopperArmorItem { diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java b/src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java index e0d14b13c..18d5f81ed 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java @@ -14,8 +14,6 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraft.item.Item.Properties; - @EventBusSubscriber public class DivingHelmetItem extends CopperArmorItem { diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java b/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java index e8a446804..c3f4e7bc5 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java @@ -20,8 +20,6 @@ import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class AbstractBellBlock extends BellBlock implements ITE { public AbstractBellBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/BasicParticleData.java b/src/main/java/com/simibubi/create/content/curiosities/bell/BasicParticleData.java index 2eecfd4d7..4ff8f8328 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/BasicParticleData.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/BasicParticleData.java @@ -18,8 +18,6 @@ import net.minecraft.util.registry.Registry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.particles.IParticleData.IDeserializer; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public abstract class BasicParticleData implements IParticleData, ICustomParticleDataWithSprite> { diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellBlock.java b/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellBlock.java index bb4df62fd..7b02626a5 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellBlock.java @@ -9,8 +9,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class HauntedBellBlock extends AbstractBellBlock { public HauntedBellBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java b/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java index 32bf92fd6..054b37668 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java @@ -19,8 +19,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class PeculiarBellBlock extends AbstractBellBlock { public PeculiarBellBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java index b55cf3908..d65e73073 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java @@ -10,8 +10,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Quaternion; import net.minecraft.util.math.vector.Vector3f; -import com.simibubi.create.content.curiosities.bell.BasicParticleData.IBasicParticleFactory; - public class SoulBaseParticle extends CustomRotationParticle { private final IAnimatedSprite animatedSprite; diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java index 2fb9d4c76..32eb92bdf 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java @@ -12,8 +12,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Quaternion; import net.minecraft.util.math.vector.Vector3f; -import com.simibubi.create.content.curiosities.bell.BasicParticleData.IBasicParticleFactory; - public class SoulParticle extends CustomRotationParticle { private final IAnimatedSprite animatedSprite; diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java index b127efcb4..f912de98b 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java @@ -48,8 +48,6 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.network.PacketDistributor; -import net.minecraft.item.Item.Properties; - public class SymmetryWandItem extends Item { public static final String SYMMETRY = "symmetry"; diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintItem.java b/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintItem.java index c1638fee7..7e3b069e1 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintItem.java @@ -32,8 +32,6 @@ import net.minecraftforge.common.crafting.StackList; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.items.ItemStackHandler; -import net.minecraft.item.Item.Properties; - public class BlueprintItem extends Item { public BlueprintItem(Properties p_i48487_1_) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java index c833042b6..4947f3636 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java @@ -49,8 +49,6 @@ import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraft.item.Item.Properties; - @EventBusSubscriber public class ExtendoGripItem extends Item { private static DamageSource lastActiveDamageSource; diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java b/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java index b35d16750..5ee736091 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java @@ -27,8 +27,6 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; -import net.minecraft.item.Item.Properties; - @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public class SandPaperItem extends Item { diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java index 7ccfc3b00..6e2b6c9e8 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java @@ -44,8 +44,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.item.Item.Properties; - public class PotatoCannonItem extends ShootableItem { public static ItemStack CLIENT_CURRENT_AMMO = ItemStack.EMPTY; diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java index 40888f2d1..3b427f143 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.curiosities.weapons; +import static com.simibubi.create.content.curiosities.weapons.PotatoProjectileRenderMode.entityRandom; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.MatrixStacker; @@ -11,12 +13,12 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public abstract class PotatoProjectileRenderMode { +public interface PotatoProjectileRenderMode { @OnlyIn(Dist.CLIENT) - public abstract void transform(MatrixStack ms, PotatoProjectileEntity entity, float pt); + void transform(MatrixStack ms, PotatoProjectileEntity entity, float pt); - public static class Billboard extends PotatoProjectileRenderMode { + public static class Billboard implements PotatoProjectileRenderMode { @Override @OnlyIn(Dist.CLIENT) @@ -47,7 +49,7 @@ public abstract class PotatoProjectileRenderMode { } } - public static class TowardMotion extends PotatoProjectileRenderMode { + public static class TowardMotion implements PotatoProjectileRenderMode { private int spriteAngleOffset; private float spin; @@ -72,7 +74,7 @@ public abstract class PotatoProjectileRenderMode { } - public static class StuckToEntity extends PotatoProjectileRenderMode { + public static class StuckToEntity implements PotatoProjectileRenderMode { private Vector3d offset; diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoRecoveryEnchantment.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoRecoveryEnchantment.java index 77b017564..d6f770279 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoRecoveryEnchantment.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoRecoveryEnchantment.java @@ -5,8 +5,6 @@ import net.minecraft.enchantment.EnchantmentType; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; -import net.minecraft.enchantment.Enchantment.Rarity; - public class PotatoRecoveryEnchantment extends Enchantment { public PotatoRecoveryEnchantment(Rarity p_i46731_1_, EnchantmentType p_i46731_2_, EquipmentSlotType[] p_i46731_3_) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java index 54f954931..c8f895948 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java @@ -42,8 +42,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.DistExecutor; -import net.minecraft.item.Item.Properties; - public abstract class ZapperItem extends Item { public ZapperItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java index 9b7a1ce2a..107aa9a8b 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java @@ -21,8 +21,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.item.Item.Properties; - public class WorldshaperItem extends ZapperItem { public WorldshaperItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlock.java index 3fc108e7b..561ed4619 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlock.java @@ -35,8 +35,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class BeltTunnelBlock extends Block implements ITE, IWrenchable { public static final Property SHAPE = EnumProperty.create("shape", Shape.class); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelItem.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelItem.java index ea38d5455..5bcb5aac3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelItem.java @@ -16,8 +16,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.world.World; -import net.minecraft.item.Item.Properties; - public class BeltTunnelItem extends BlockItem { public BeltTunnelItem(Block p_i48527_1_, Properties p_i48527_2_) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelShapes.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelShapes.java index 85dd51eff..563cfaebe 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelShapes.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelShapes.java @@ -1,6 +1,8 @@ package com.simibubi.create.content.logistics.block.belts.tunnel; +import static net.minecraft.block.Block.box; + import com.simibubi.create.foundation.utility.VoxelShaper; import net.minecraft.block.BlockState; @@ -10,8 +12,6 @@ import net.minecraft.util.math.shapes.IBooleanFunction; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; -import static net.minecraft.block.Block.box; - public class BeltTunnelShapes { private static VoxelShape block = box(0, -5, 0, 16, 16, 16); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelCTBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelCTBehaviour.java index 2f5f70a03..2c8196db3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelCTBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelCTBehaviour.java @@ -10,8 +10,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockDisplayReader; -import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour.CTContext; - public class BrassTunnelCTBehaviour extends ConnectedTextureBehaviour { @Override diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/AbstractChuteBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/chute/AbstractChuteBlock.java index 72960cebf..5e142fc13 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/chute/AbstractChuteBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/chute/AbstractChuteBlock.java @@ -32,8 +32,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.util.LazyOptional; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class AbstractChuteBlock extends Block implements IWrenchable, ITE { public AbstractChuteBlock(Properties p_i48440_1_) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteBlock.java index bc3f6e87a..fb885f469 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteBlock.java @@ -27,8 +27,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class ChuteBlock extends AbstractChuteBlock { public static final Property SHAPE = EnumProperty.create("shape", Shape.class); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteItem.java b/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteItem.java index a9686aeea..6a279ae18 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteItem.java @@ -9,8 +9,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.item.Item.Properties; - public class ChuteItem extends BlockItem { public ChuteItem(Block p_i48527_1_, Properties p_i48527_2_) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java index 1ab93b740..14e6f209f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java @@ -17,8 +17,6 @@ import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class SmartChuteBlock extends AbstractChuteBlock { public SmartChuteBlock(Properties p_i48440_1_) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java index ca14a75fe..eaaf0b0e9 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java @@ -23,8 +23,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class DepotBlock extends Block implements ITE, IWrenchable { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java index 551d843ad..ad96c1481 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java @@ -32,8 +32,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class EjectorBlock extends HorizontalKineticBlock implements ITE { public EjectorBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorItem.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorItem.java index 2423d9a01..26bc2d526 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorItem.java @@ -14,8 +14,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraft.item.Item.Properties; - @EventBusSubscriber public class EjectorItem extends BlockItem { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeBlock.java index 82c434796..433b637d6 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeBlock.java @@ -5,8 +5,6 @@ import com.simibubi.create.content.contraptions.wrench.IWrenchable; import net.minecraft.block.BlockState; import net.minecraft.block.RedstoneDiodeBlock; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class AbstractDiodeBlock extends RedstoneDiodeBlock implements IWrenchable { public AbstractDiodeBlock(Properties builder) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterBlock.java index 9a49c184a..f17b34785 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterBlock.java @@ -12,8 +12,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -import net.minecraft.block.AbstractBlock.Properties; - public class AdjustableRepeaterBlock extends AbstractDiodeBlock { public static BooleanProperty POWERING = BooleanProperty.create("powering"); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java index 667f9cbce..f5a27b6a5 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java @@ -16,8 +16,6 @@ import net.minecraft.world.TickPriority; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class PoweredLatchBlock extends ToggleLatchBlock { public static BooleanProperty POWERED_SIDE = BooleanProperty.create("powered_side"); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlock.java index 2e1253f4a..51a04bb4a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlock.java @@ -12,8 +12,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.TickPriority; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class PulseRepeaterBlock extends AbstractDiodeBlock { public static BooleanProperty PULSING = BooleanProperty.create("pulsing"); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java index 553c704cd..fc07e4a61 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java @@ -18,8 +18,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class ToggleLatchBlock extends AbstractDiodeBlock { public static BooleanProperty POWERING = BooleanProperty.create("powering"); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractDirectionalFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractDirectionalFunnelBlock.java index 50bedef64..58b376395 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractDirectionalFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractDirectionalFunnelBlock.java @@ -9,8 +9,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; -import net.minecraft.block.AbstractBlock.Properties; - public class AbstractDirectionalFunnelBlock extends AbstractFunnelBlock { public static final DirectionProperty FACING = BlockStateProperties.FACING; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractFunnelBlock.java index 17beebbdb..4084b5b24 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractFunnelBlock.java @@ -31,8 +31,6 @@ import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class AbstractFunnelBlock extends Block implements ITE, IWrenchable { public static final BooleanProperty POWERED = BlockStateProperties.POWERED; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractHorizontalFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractHorizontalFunnelBlock.java index 744220291..b0d1daa3c 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractHorizontalFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractHorizontalFunnelBlock.java @@ -9,8 +9,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class AbstractHorizontalFunnelBlock extends AbstractFunnelBlock { public static final DirectionProperty HORIZONTAL_FACING = BlockStateProperties.HORIZONTAL_FACING; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AndesiteFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/AndesiteFunnelBlock.java index 2191748a3..af1104706 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AndesiteFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/AndesiteFunnelBlock.java @@ -7,8 +7,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -import net.minecraft.block.AbstractBlock.Properties; - public class AndesiteFunnelBlock extends FunnelBlock { public AndesiteFunnelBlock(Properties p_i48415_1_) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java index e7e95f618..46a5d6412 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java @@ -35,8 +35,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class BeltFunnelBlock extends AbstractHorizontalFunnelBlock implements ISpecialBlockItemRequirement { private BlockEntry parent; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BrassFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/BrassFunnelBlock.java index d5a1f8426..df3f1a297 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BrassFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/BrassFunnelBlock.java @@ -7,8 +7,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -import net.minecraft.block.AbstractBlock.Properties; - public class BrassFunnelBlock extends FunnelBlock { public BrassFunnelBlock(Properties p_i48415_1_) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java index 51a9b06bd..dae2ff98e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java @@ -28,8 +28,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public abstract class FunnelBlock extends AbstractDirectionalFunnelBlock { public static final BooleanProperty EXTRACTING = BooleanProperty.create("extracting"); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelItem.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelItem.java index df9cad383..3aa9d83b3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelItem.java @@ -14,8 +14,6 @@ import net.minecraftforge.eventbus.api.Event.Result; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraft.item.Item.Properties; - @EventBusSubscriber public class FunnelItem extends BlockItem { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java index 5402bebc7..fc50c07f1 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java @@ -18,8 +18,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraft.block.AbstractBlock.Properties; - public class AdjustableCrateBlock extends CrateBlock { public AdjustableCrateBlock(Properties p_i48415_1_) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java index 5b3e88f97..659a49aff 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java @@ -19,8 +19,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class CrateBlock extends ProperDirectionalBlock implements IWrenchable { public static final BooleanProperty DOUBLE = BooleanProperty.create("double"); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java index 16f35efac..b7831cfe9 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java @@ -9,8 +9,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class CreativeCrateBlock extends CrateBlock implements ITE { public CreativeCrateBlock(Properties p_i48415_1_) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmBlock.java index 328ebf0a8..1279f6a11 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmBlock.java @@ -29,8 +29,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class ArmBlock extends KineticBlock implements ITE, ICogWheel { public static final BooleanProperty CEILING = BooleanProperty.create("ceiling"); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmItem.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmItem.java index ed0f82dc0..5b49ef8ab 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmItem.java @@ -13,8 +13,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraft.item.Item.Properties; - @EventBusSubscriber public class ArmItem extends BlockItem { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverBlock.java index 1f2484371..00f805719 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverBlock.java @@ -29,8 +29,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.block.AbstractBlock.Properties; - public class AnalogLeverBlock extends HorizontalFaceBlock implements ITE { public AnalogLeverBlock(Properties p_i48402_1_) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ContentObserverBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/ContentObserverBlock.java index 0eabc9284..ce0b60d57 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ContentObserverBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/ContentObserverBlock.java @@ -32,8 +32,6 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraft.block.AbstractBlock.Properties; - public class ContentObserverBlock extends HorizontalBlock implements ITE, IWrenchable { public static final BooleanProperty POWERED = BlockStateProperties.POWERED; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java index a85d24e45..1897b46d6 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java @@ -38,8 +38,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class NixieTubeBlock extends HorizontalBlock implements ITE, IWrenchable, ISpecialBlockItemRequirement { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java index 4b5859442..f43297a83 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java @@ -22,8 +22,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class RedstoneContactBlock extends ProperDirectionalBlock { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java index c7505e3dc..ea4140d4e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java @@ -30,8 +30,6 @@ import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class RedstoneLinkBlock extends ProperDirectionalBlock implements ITE { public static final BooleanProperty POWERED = BlockStateProperties.POWERED; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java index b2887a7a2..c1a1398b5 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java @@ -35,8 +35,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraft.block.AbstractBlock.Properties; - public class StockpileSwitchBlock extends HorizontalBlock implements ITE, IWrenchable { public static final IntegerProperty INDICATOR = IntegerProperty.create("indicator", 0, 6); diff --git a/src/main/java/com/simibubi/create/content/logistics/item/CardboardBoxItem.java b/src/main/java/com/simibubi/create/content/logistics/item/CardboardBoxItem.java index 4e6573fa6..085727e15 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/CardboardBoxItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/CardboardBoxItem.java @@ -24,8 +24,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.util.Constants; -import net.minecraft.item.Item.Properties; - public class CardboardBoxItem extends Item { static final int SLOTS = 9; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java b/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java index eadb09685..1e8f87a77 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java @@ -25,8 +25,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.block.AbstractBlock.Properties; - public class LecternControllerBlock extends LecternBlock implements ITE, ISpecialBlockItemRequirement { public LecternControllerBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerItem.java b/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerItem.java index 21cdf552a..bbc3d7eff 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerItem.java @@ -31,8 +31,6 @@ import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.items.ItemStackHandler; -import net.minecraft.item.Item.Properties; - public class LinkedControllerItem extends Item implements INamedContainerProvider { public LinkedControllerItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java index 52906a1ad..b6685de89 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java @@ -41,8 +41,6 @@ import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; -import net.minecraft.item.Item.Properties; - public class FilterItem extends Item implements INamedContainerProvider { private FilterType type; diff --git a/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java b/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java index 14bb132ba..b843de134 100644 --- a/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java @@ -9,8 +9,6 @@ import net.minecraft.world.IBlockDisplayReader; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.block.AbstractBlock.Properties; - public class ConnectedGlassBlock extends GlassBlock { public ConnectedGlassBlock(Properties p_i48392_1_) { diff --git a/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassPaneBlock.java b/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassPaneBlock.java index add90e71a..a09a2cb6e 100644 --- a/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassPaneBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassPaneBlock.java @@ -5,8 +5,6 @@ import net.minecraft.util.Direction; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.block.AbstractBlock.Properties; - public class ConnectedGlassPaneBlock extends GlassPaneBlock { public ConnectedGlassPaneBlock(Properties builder) { diff --git a/src/main/java/com/simibubi/create/content/palettes/GlassPaneBlock.java b/src/main/java/com/simibubi/create/content/palettes/GlassPaneBlock.java index 85a875828..afd74e0d8 100644 --- a/src/main/java/com/simibubi/create/content/palettes/GlassPaneBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/GlassPaneBlock.java @@ -2,8 +2,6 @@ package com.simibubi.create.content.palettes; import net.minecraft.block.PaneBlock; -import net.minecraft.block.AbstractBlock.Properties; - public class GlassPaneBlock extends PaneBlock { public GlassPaneBlock(Properties builder) { diff --git a/src/main/java/com/simibubi/create/content/palettes/PavedBlock.java b/src/main/java/com/simibubi/create/content/palettes/PavedBlock.java index 5604a46ba..8c29e223b 100644 --- a/src/main/java/com/simibubi/create/content/palettes/PavedBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/PavedBlock.java @@ -9,8 +9,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class PavedBlock extends Block { public static final BooleanProperty COVERED = BooleanProperty.create("covered"); diff --git a/src/main/java/com/simibubi/create/content/palettes/WindowBlock.java b/src/main/java/com/simibubi/create/content/palettes/WindowBlock.java index 827c1f852..30764cedd 100644 --- a/src/main/java/com/simibubi/create/content/palettes/WindowBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/WindowBlock.java @@ -7,8 +7,6 @@ import net.minecraft.util.Direction; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.block.AbstractBlock.Properties; - public class WindowBlock extends ConnectedGlassBlock { public WindowBlock(Properties p_i48392_1_) { diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlock.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlock.java index 3b20bce84..9ec819e8a 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlock.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlock.java @@ -25,8 +25,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraft.block.AbstractBlock.Properties; - public class SchematicTableBlock extends HorizontalBlock implements ITE { public SchematicTableBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonBlock.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonBlock.java index 1fcbf8d55..706b29bb5 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonBlock.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonBlock.java @@ -21,8 +21,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraft.block.AbstractBlock.Properties; - public class SchematicannonBlock extends Block implements ITE { public SchematicannonBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java index ffc833c84..5521a1475 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java @@ -56,7 +56,6 @@ import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java b/src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java index 63b5e67ee..30e330076 100644 --- a/src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java +++ b/src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java @@ -2,8 +2,6 @@ package com.simibubi.create.content.schematics.item; import net.minecraft.item.Item; -import net.minecraft.item.Item.Properties; - public class SchematicAndQuillItem extends Item { public SchematicAndQuillItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java b/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java index ffdede407..9c78c265c 100644 --- a/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java +++ b/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java @@ -50,8 +50,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.thread.SidedThreadGroups; -import net.minecraft.item.Item.Properties; - public class SchematicItem extends Item { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/com/simibubi/create/foundation/advancement/CriterionTriggerBase.java b/src/main/java/com/simibubi/create/foundation/advancement/CriterionTriggerBase.java index 7ebc2a596..c6389a6cb 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/CriterionTriggerBase.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/CriterionTriggerBase.java @@ -21,8 +21,6 @@ import net.minecraft.advancements.criterion.EntityPredicate; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.util.ResourceLocation; -import net.minecraft.advancements.ICriterionTrigger.Listener; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public abstract class CriterionTriggerBase implements ICriterionTrigger { diff --git a/src/main/java/com/simibubi/create/foundation/block/ProperDirectionalBlock.java b/src/main/java/com/simibubi/create/foundation/block/ProperDirectionalBlock.java index 17416492a..1d294eb84 100644 --- a/src/main/java/com/simibubi/create/foundation/block/ProperDirectionalBlock.java +++ b/src/main/java/com/simibubi/create/foundation/block/ProperDirectionalBlock.java @@ -12,8 +12,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; -import net.minecraft.block.AbstractBlock.Properties; - public class ProperDirectionalBlock extends DirectionalBlock implements IWrenchable { public ProperDirectionalBlock(Properties p_i48415_1_) { diff --git a/src/main/java/com/simibubi/create/foundation/collision/ContinuousOBBCollider.java b/src/main/java/com/simibubi/create/foundation/collision/ContinuousOBBCollider.java index 8b56c8ba6..39ff0d745 100644 --- a/src/main/java/com/simibubi/create/foundation/collision/ContinuousOBBCollider.java +++ b/src/main/java/com/simibubi/create/foundation/collision/ContinuousOBBCollider.java @@ -5,8 +5,6 @@ import static java.lang.Math.signum; import net.minecraft.util.math.vector.Vector3d; -import com.simibubi.create.foundation.collision.OBBCollider.SeparationManifold; - public class ContinuousOBBCollider extends OBBCollider { public static ContinuousSeparationManifold separateBBs(Vector3d cA, Vector3d cB, Vector3d eA, Vector3d eB, diff --git a/src/main/java/com/simibubi/create/foundation/command/PonderCommand.java b/src/main/java/com/simibubi/create/foundation/command/PonderCommand.java index ea174394b..853de1525 100644 --- a/src/main/java/com/simibubi/create/foundation/command/PonderCommand.java +++ b/src/main/java/com/simibubi/create/foundation/command/PonderCommand.java @@ -21,7 +21,7 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.network.PacketDistributor; public class PonderCommand { - public static final SuggestionProvider ITEM_PONDERS = SuggestionProviders.register(new ResourceLocation("all_ponders"), (iSuggestionProviderCommandContext, builder) -> ISuggestionProvider.suggestResource(PonderRegistry.all.keySet().stream(), builder)); + public static final SuggestionProvider ITEM_PONDERS = SuggestionProviders.register(new ResourceLocation("all_ponders"), (iSuggestionProviderCommandContext, builder) -> ISuggestionProvider.suggestResource(PonderRegistry.ALL.keySet().stream(), builder)); static ArgumentBuilder register() { return Commands.literal("ponder") diff --git a/src/main/java/com/simibubi/create/foundation/command/SConfigureConfigPacket.java b/src/main/java/com/simibubi/create/foundation/command/SConfigureConfigPacket.java index 192321c33..489ace535 100644 --- a/src/main/java/com/simibubi/create/foundation/command/SConfigureConfigPacket.java +++ b/src/main/java/com/simibubi/create/foundation/command/SConfigureConfigPacket.java @@ -195,7 +195,7 @@ public class SConfigureConfigPacket extends SimplePacketBase { } ResourceLocation id = new ResourceLocation(value); - if (!PonderRegistry.all.containsKey(id)) { + if (!PonderRegistry.ALL.containsKey(id)) { Create.LOGGER.error("Could not find ponder scenes for item: " + id); return; } diff --git a/src/main/java/com/simibubi/create/foundation/config/CClient.java b/src/main/java/com/simibubi/create/foundation/config/CClient.java index c54d8ad82..bea229d1e 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CClient.java +++ b/src/main/java/com/simibubi/create/foundation/config/CClient.java @@ -1,10 +1,4 @@ package com.simibubi.create.foundation.config; -import com.simibubi.create.foundation.config.ConfigBase.ConfigBool; -import com.simibubi.create.foundation.config.ConfigBase.ConfigEnum; -import com.simibubi.create.foundation.config.ConfigBase.ConfigFloat; -import com.simibubi.create.foundation.config.ConfigBase.ConfigGroup; -import com.simibubi.create.foundation.config.ConfigBase.ConfigInt; - public class CClient extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/foundation/config/CCuriosities.java b/src/main/java/com/simibubi/create/foundation/config/CCuriosities.java index e1e5840c5..2ba15eaea 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CCuriosities.java +++ b/src/main/java/com/simibubi/create/foundation/config/CCuriosities.java @@ -1,6 +1,4 @@ package com.simibubi.create.foundation.config; -import com.simibubi.create.foundation.config.ConfigBase.ConfigInt; - public class CCuriosities extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/foundation/config/CFluids.java b/src/main/java/com/simibubi/create/foundation/config/CFluids.java index 1c546399e..ad8684da1 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CFluids.java +++ b/src/main/java/com/simibubi/create/foundation/config/CFluids.java @@ -1,6 +1,4 @@ package com.simibubi.create.foundation.config; -import com.simibubi.create.foundation.config.ConfigBase.ConfigInt; - public class CFluids extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/foundation/config/CKinetics.java b/src/main/java/com/simibubi/create/foundation/config/CKinetics.java index d4cf51867..b5fe5002d 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CKinetics.java +++ b/src/main/java/com/simibubi/create/foundation/config/CKinetics.java @@ -1,10 +1,4 @@ package com.simibubi.create.foundation.config; -import com.simibubi.create.foundation.config.ConfigBase.ConfigBool; -import com.simibubi.create.foundation.config.ConfigBase.ConfigEnum; -import com.simibubi.create.foundation.config.ConfigBase.ConfigFloat; -import com.simibubi.create.foundation.config.ConfigBase.ConfigGroup; -import com.simibubi.create.foundation.config.ConfigBase.ConfigInt; - public class CKinetics extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/foundation/config/CLogistics.java b/src/main/java/com/simibubi/create/foundation/config/CLogistics.java index 76fbeced0..33e4333cb 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CLogistics.java +++ b/src/main/java/com/simibubi/create/foundation/config/CLogistics.java @@ -1,6 +1,4 @@ package com.simibubi.create.foundation.config; -import com.simibubi.create.foundation.config.ConfigBase.ConfigInt; - public class CLogistics extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/foundation/config/CRecipes.java b/src/main/java/com/simibubi/create/foundation/config/CRecipes.java index fabba448b..86531dcb6 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CRecipes.java +++ b/src/main/java/com/simibubi/create/foundation/config/CRecipes.java @@ -1,7 +1,4 @@ package com.simibubi.create.foundation.config; -import com.simibubi.create.foundation.config.ConfigBase.ConfigBool; -import com.simibubi.create.foundation.config.ConfigBase.ConfigInt; - public class CRecipes extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/foundation/config/CSchematics.java b/src/main/java/com/simibubi/create/foundation/config/CSchematics.java index 445ca9a2d..21a38ef34 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CSchematics.java +++ b/src/main/java/com/simibubi/create/foundation/config/CSchematics.java @@ -1,8 +1,4 @@ package com.simibubi.create.foundation.config; -import com.simibubi.create.foundation.config.ConfigBase.ConfigFloat; -import com.simibubi.create.foundation.config.ConfigBase.ConfigGroup; -import com.simibubi.create.foundation.config.ConfigBase.ConfigInt; - public class CSchematics extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/foundation/config/CServer.java b/src/main/java/com/simibubi/create/foundation/config/CServer.java index ddac01277..e5cf81cfd 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CServer.java +++ b/src/main/java/com/simibubi/create/foundation/config/CServer.java @@ -1,7 +1,4 @@ package com.simibubi.create.foundation.config; -import com.simibubi.create.foundation.config.ConfigBase.ConfigGroup; -import com.simibubi.create.foundation.config.ConfigBase.ConfigInt; - public class CServer extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/foundation/config/CWorldGen.java b/src/main/java/com/simibubi/create/foundation/config/CWorldGen.java index f1aa768c3..f90afb0a0 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CWorldGen.java +++ b/src/main/java/com/simibubi/create/foundation/config/CWorldGen.java @@ -4,8 +4,6 @@ import com.simibubi.create.foundation.worldgen.AllWorldFeatures; import net.minecraftforge.common.ForgeConfigSpec.Builder; -import com.simibubi.create.foundation.config.ConfigBase.ConfigBool; - public class CWorldGen extends ConfigBase { public ConfigBool disable = b(false, "disableWorldGen", Comments.disable); diff --git a/src/main/java/com/simibubi/create/foundation/data/AllLangPartials.java b/src/main/java/com/simibubi/create/foundation/data/AllLangPartials.java index 9904c53b4..6392055b6 100644 --- a/src/main/java/com/simibubi/create/foundation/data/AllLangPartials.java +++ b/src/main/java/com/simibubi/create/foundation/data/AllLangPartials.java @@ -4,7 +4,7 @@ import com.google.common.base.Supplier; import com.google.gson.JsonElement; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.Create; -import com.simibubi.create.foundation.ponder.PonderRegistry; +import com.simibubi.create.foundation.ponder.PonderLocalization; import com.simibubi.create.foundation.utility.FilesHelper; import com.simibubi.create.foundation.utility.Lang; @@ -14,7 +14,7 @@ public enum AllLangPartials { MESSAGES("UI & Messages"), SUBTITLES("Subtitles", AllSoundEvents::provideLangEntries), TOOLTIPS("Item Descriptions"), - PONDER("Ponder Content", PonderRegistry::provideLangEntries), + PONDER("Ponder Content", PonderLocalization::provideLangEntries), ; diff --git a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java index f4830ec00..a3d1840cc 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java +++ b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java @@ -28,6 +28,7 @@ import com.simibubi.create.foundation.config.StressConfigDefaults; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.client.renderer.RenderType; @@ -41,8 +42,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraft.block.AbstractBlock; - public class BuilderTransformers { public static NonNullUnaryOperator> cuckooClock() { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CompactingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CompactingRecipeGen.java index 2ae48e5c3..ccf3125c5 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CompactingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CompactingRecipeGen.java @@ -12,8 +12,6 @@ import net.minecraft.fluid.Fluids; import net.minecraft.item.Items; import net.minecraftforge.common.Tags; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; - public class CompactingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java index 288ef4b12..4262c8bcc 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java @@ -14,9 +14,6 @@ import net.minecraft.tags.ItemTags; import net.minecraftforge.common.crafting.conditions.NotCondition; import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.I; - public class CrushingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java index 9251f0b74..eac7c4424 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java @@ -7,9 +7,6 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.data.DataGenerator; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.I; - public class CuttingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/EmptyingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/EmptyingRecipeGen.java index 42d9b9bb3..9df7864d4 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/EmptyingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/EmptyingRecipeGen.java @@ -7,8 +7,6 @@ import com.simibubi.create.AllRecipeTypes; import net.minecraft.data.DataGenerator; import net.minecraft.item.Items; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; - public class EmptyingRecipeGen extends ProcessingRecipeGen { /* diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java index 6799d7cdd..62ed6d8b2 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java @@ -12,8 +12,6 @@ import net.minecraft.item.Items; import net.minecraft.potion.Potions; import net.minecraftforge.common.Tags; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; - public class FillingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java index 8bff65111..3f806faf7 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java @@ -183,7 +183,7 @@ public class MechanicalCraftingRecipeBuilder { } public IRecipeSerializer getType() { - return AllRecipeTypes.MECHANICAL_CRAFTING.serializer; + return AllRecipeTypes.MECHANICAL_CRAFTING.getSerializer(); } public ResourceLocation getId() { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java index 2d8585af5..d4e5c5eb5 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java @@ -15,9 +15,6 @@ import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.I; - public class MechanicalCraftingRecipeGen extends CreateRecipeProvider { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java index c6e339586..92480a848 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java @@ -14,8 +14,6 @@ import net.minecraft.tags.ItemTags; import net.minecraftforge.common.crafting.conditions.NotCondition; import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; - public class MillingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java index e3c346298..6e26a2e26 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java @@ -13,9 +13,6 @@ import net.minecraft.item.Items; import net.minecraft.tags.ItemTags; import net.minecraftforge.common.Tags; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.I; - public class MixingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/PolishingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/PolishingRecipeGen.java index 67526b1d0..8f1ea96aa 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/PolishingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/PolishingRecipeGen.java @@ -5,8 +5,6 @@ import com.simibubi.create.AllRecipeTypes; import net.minecraft.data.DataGenerator; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; - public class PolishingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java index 34fa2f987..847efae00 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java @@ -7,9 +7,6 @@ import net.minecraft.data.DataGenerator; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.I; - public class PressingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java index 90ae53c38..07734300d 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java @@ -20,8 +20,6 @@ import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidAttributes; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; - public abstract class ProcessingRecipeGen extends CreateRecipeProvider { protected static List generators = new ArrayList<>(); @@ -116,9 +114,8 @@ public abstract class ProcessingRecipeGen extends CreateRecipeProvider { return create(Create.asResource(name), transform); } - @SuppressWarnings("unchecked") protected > ProcessingRecipeSerializer getSerializer() { - ProcessingRecipeSerializer serializer = (ProcessingRecipeSerializer) getRecipeType().serializer; + ProcessingRecipeSerializer serializer = getRecipeType().getSerializer(); return serializer; } diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java index 6e8497008..42b653da0 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java @@ -15,9 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.tags.ItemTags; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.I; - public class SequencedAssemblyRecipeGen extends CreateRecipeProvider { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index 440a573bd..738ae440d 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -51,10 +51,6 @@ import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.ModLoadedCondition; import net.minecraftforge.common.crafting.conditions.NotCondition; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.I; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.Marker; - @SuppressWarnings("unused") public class StandardRecipeGen extends CreateRecipeProvider { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java index 1ae416478..54acfecce 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java @@ -26,8 +26,6 @@ import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; - public class WashingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe diff --git a/src/main/java/com/simibubi/create/foundation/fluid/CombinedTankWrapper.java b/src/main/java/com/simibubi/create/foundation/fluid/CombinedTankWrapper.java index 6639e9722..8a25aa0fe 100644 --- a/src/main/java/com/simibubi/create/foundation/fluid/CombinedTankWrapper.java +++ b/src/main/java/com/simibubi/create/foundation/fluid/CombinedTankWrapper.java @@ -6,8 +6,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.wrapper.EmptyHandler; -import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; - /** * Combines multiple IFluidHandlers into one interface (See CombinedInvWrapper * for items) diff --git a/src/main/java/com/simibubi/create/foundation/item/HiddenIngredientItem.java b/src/main/java/com/simibubi/create/foundation/item/HiddenIngredientItem.java index 3671935ad..899dcce8e 100644 --- a/src/main/java/com/simibubi/create/foundation/item/HiddenIngredientItem.java +++ b/src/main/java/com/simibubi/create/foundation/item/HiddenIngredientItem.java @@ -5,8 +5,6 @@ import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraft.item.Item.Properties; - public class HiddenIngredientItem extends Item { public HiddenIngredientItem(Properties p_i48487_1_) { diff --git a/src/main/java/com/simibubi/create/foundation/item/TagDependentIngredientItem.java b/src/main/java/com/simibubi/create/foundation/item/TagDependentIngredientItem.java index 777e174c9..0b10e3196 100644 --- a/src/main/java/com/simibubi/create/foundation/item/TagDependentIngredientItem.java +++ b/src/main/java/com/simibubi/create/foundation/item/TagDependentIngredientItem.java @@ -8,8 +8,6 @@ import net.minecraft.tags.ItemTags; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; -import net.minecraft.item.Item.Properties; - public class TagDependentIngredientItem extends Item { private ResourceLocation tag; diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderLocalization.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderLocalization.java index d5b6a52cc..53b25a053 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/PonderLocalization.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderLocalization.java @@ -7,72 +7,99 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.simibubi.create.Create; import com.simibubi.create.foundation.ponder.content.PonderIndex; +import com.simibubi.create.foundation.ponder.content.PonderTag; import com.simibubi.create.foundation.ponder.content.PonderTagIndexScreen; import com.simibubi.create.foundation.ponder.content.PonderTagScreen; +import com.simibubi.create.foundation.ponder.content.SharedText; import com.simibubi.create.foundation.utility.Couple; -import com.simibubi.create.foundation.utility.Lang; +import com.tterrag.registrate.AbstractRegistrate; + +import net.minecraft.client.resources.I18n; +import net.minecraft.util.ResourceLocation; public class PonderLocalization { - static Map shared = new HashMap<>(); - static Map> tag = new HashMap<>(); - static Map> specific = new HashMap<>(); + static final Map SHARED = new HashMap<>(); + static final Map> TAG = new HashMap<>(); + static final Map> SPECIFIC = new HashMap<>(); // - public static void registerTag(String key, String enUS, String description) { - tag.put(key, Couple.create(enUS, description)); + public static void registerShared(ResourceLocation key, String enUS) { + SHARED.put(key, enUS); } - public static void registerShared(String key, String enUS) { - shared.put(key, enUS); + public static void registerTag(ResourceLocation key, String enUS, String description) { + TAG.put(key, Couple.create(enUS, description)); } - public static void registerSpecific(String sceneId, String key, String enUS) { - specific.computeIfAbsent(sceneId, $ -> new HashMap<>()) + public static void registerSpecific(ResourceLocation sceneId, String key, String enUS) { + SPECIFIC.computeIfAbsent(sceneId, $ -> new HashMap<>()) .put(key, enUS); } // - public static String getShared(String key) { + public static String getShared(ResourceLocation key) { if (PonderIndex.EDITOR_MODE) - return shared.containsKey(key) ? shared.get(key) : ("unregistered shared entry:" + key); - return Lang.translate(langKeyForShared(key)) - .getString(); + return SHARED.containsKey(key) ? SHARED.get(key) : ("unregistered shared entry:" + key); + return I18n.get(langKeyForShared(key)); } - public static String getSpecific(String sceneId, String k) { + public static String getTag(ResourceLocation key) { if (PonderIndex.EDITOR_MODE) - return specific.get(sceneId) - .get(k); - return Lang.translate(langKeyForSpecific(sceneId, k)) - .getString(); - } - - public static String getTag(String key) { - if (PonderIndex.EDITOR_MODE) - return tag.containsKey(key) ? tag.get(key) + return TAG.containsKey(key) ? TAG.get(key) .getFirst() : ("unregistered tag entry:" + key); - return Lang.translate(langKeyForTag(key)) - .getString(); + return I18n.get(langKeyForTag(key)); } - public static String getTagDescription(String key) { + public static String getTagDescription(ResourceLocation key) { if (PonderIndex.EDITOR_MODE) - return tag.containsKey(key) ? tag.get(key) + return TAG.containsKey(key) ? TAG.get(key) .getSecond() : ("unregistered tag entry:" + key); - return Lang.translate(langKeyForTagDescription(key)) - .getString(); + return I18n.get(langKeyForTagDescription(key)); + } + + public static String getSpecific(ResourceLocation sceneId, String k) { + if (PonderIndex.EDITOR_MODE) + return SPECIFIC.get(sceneId) + .get(k); + return I18n.get(langKeyForSpecific(sceneId, k)); } // public static final String LANG_PREFIX = "ponder."; - public static JsonElement record() { - JsonObject object = new JsonObject(); + public static void record(String namespace, JsonObject object) { + SHARED.forEach((k, v) -> { + if (k.getNamespace().equals(namespace)) { + object.addProperty(langKeyForShared(k), v); + } + }); + TAG.forEach((k, v) -> { + if (k.getNamespace().equals(namespace)) { + object.addProperty(langKeyForTag(k), v.getFirst()); + object.addProperty(langKeyForTagDescription(k), v.getSecond()); + } + }); + + SPECIFIC.entrySet() + .stream() + .filter(entry -> entry.getKey().getNamespace().equals(namespace)) + .sorted(Map.Entry.comparingByKey()) + .forEach(entry -> { + entry.getValue() + .entrySet() + .stream() + .sorted(Map.Entry.comparingByKey()) + .forEach(subEntry -> object.addProperty( + langKeyForSpecific(entry.getKey(), subEntry.getKey()), subEntry.getValue())); + }); + } + + private static void recordGeneral(JsonObject object) { addGeneral(object, PonderTooltipHandler.HOLD_TO_PONDER, "Hold [%1$s] to Ponder"); addGeneral(object, PonderTooltipHandler.SUBJECT, "Subject of this scene"); addGeneral(object, PonderUI.PONDERING, "Pondering about..."); @@ -93,45 +120,62 @@ public class PonderLocalization { addGeneral(object, PonderTagIndexScreen.DESCRIPTION, "Click one of the icons to learn about its associated Items and Blocks"); addGeneral(object, PonderTagIndexScreen.TITLE, "Ponder Index"); - - shared.forEach((k, v) -> object.addProperty(Create.ID + "." + langKeyForShared(k), v)); - tag.forEach((k, v) -> { - object.addProperty(Create.ID + "." + langKeyForTag(k), v.getFirst()); - object.addProperty(Create.ID + "." + langKeyForTagDescription(k), v.getSecond()); - }); - - specific.entrySet() - .stream() - .sorted(Map.Entry.comparingByKey()) - .forEach(entry -> { - entry.getValue() - .entrySet() - .stream() - .sorted(Map.Entry.comparingByKey()) - .forEach(subEntry -> object.addProperty( - Create.ID + "." + langKeyForSpecific(entry.getKey(), subEntry.getKey()), subEntry.getValue())); - }); - return object; } private static void addGeneral(JsonObject json, String key, String enUS) { json.addProperty(Create.ID + "." + key, enUS); } - protected static String langKeyForSpecific(String sceneId, String k) { - return LANG_PREFIX + sceneId + "." + k; + public static void generateSceneLang() { + PonderRegistry.ALL.forEach((id, list) -> { + for (int i = 0; i < list.size(); i++) + PonderRegistry.compileScene(i, list.get(i), null); + }); } - protected static String langKeyForShared(String k) { - return LANG_PREFIX + "shared." + k; + /** + * Internal use only. + */ + public static JsonObject provideLangEntries() { + SharedText.gatherText(); + PonderTag.register(); + PonderIndex.register(); + + generateSceneLang(); + + JsonObject object = new JsonObject(); + recordGeneral(object); + record(Create.ID, object); + return object; } - protected static String langKeyForTag(String k) { - return LANG_PREFIX + "tag." + k; + public static void provideRegistrateLang(AbstractRegistrate registrate) { + generateSceneLang(); + + JsonObject object = new JsonObject(); + record(registrate.getModid(), object); + + for (Map.Entry entry : object.entrySet()) { + registrate.addRawLang(entry.getKey(), entry.getValue().getAsString()); + } } - protected static String langKeyForTagDescription(String k) { - return LANG_PREFIX + "tag." + k + ".description"; + // + + protected static String langKeyForShared(ResourceLocation k) { + return k.getNamespace() + "." + LANG_PREFIX + "shared." + k.getPath(); + } + + protected static String langKeyForTag(ResourceLocation k) { + return k.getNamespace() + "." + LANG_PREFIX + "tag." + k.getPath(); + } + + protected static String langKeyForTagDescription(ResourceLocation k) { + return k.getNamespace() + "." + LANG_PREFIX + "tag." + k.getPath() + ".description"; + } + + protected static String langKeyForSpecific(ResourceLocation sceneId, String k) { + return sceneId.getNamespace() + "." + LANG_PREFIX + sceneId.getPath() + "." + k; } } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderRegistry.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderRegistry.java index dac81b346..ffe9fc99e 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/PonderRegistry.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderRegistry.java @@ -12,7 +12,6 @@ import java.util.Map; import java.util.function.Consumer; import java.util.zip.GZIPInputStream; -import com.google.gson.JsonElement; import com.simibubi.create.Create; import com.simibubi.create.foundation.ponder.PonderStoryBoardEntry.PonderStoryBoard; import com.simibubi.create.foundation.ponder.content.PonderChapter; @@ -27,6 +26,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTSizeTracker; +import net.minecraft.resources.IResource; +import net.minecraft.resources.IResourceManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.gen.feature.template.PlacementSettings; @@ -34,52 +35,75 @@ import net.minecraft.world.gen.feature.template.Template; public class PonderRegistry { - public static final PonderTagRegistry tags = new PonderTagRegistry(); - public static final PonderChapterRegistry chapters = new PonderChapterRegistry(); - public static Map> all = new HashMap<>(); + public static final PonderTagRegistry TAGS = new PonderTagRegistry(); + public static final PonderChapterRegistry CHAPTERS = new PonderChapterRegistry(); + // Map from item ids to all storyboards + public static final Map> ALL = new HashMap<>(); - public static PonderSceneBuilder addStoryBoard(ItemProviderEntry component, String schematic, + private static String currentNamespace; + + public static void startRegistration(String namespace) { + if (currentNamespace != null) { + throw new IllegalStateException("Cannot start registration when already started!"); + } + currentNamespace = namespace; + } + + public static void endRegistration() { + if (currentNamespace == null) { + throw new IllegalStateException("Cannot end registration when not started!"); + } + currentNamespace = null; + } + + private static String getNamespaceOrThrow() { + if (currentNamespace == null) { + throw new IllegalStateException("Cannot register storyboard without starting registration!"); + } + return currentNamespace; + } + + public static PonderSceneBuilder addStoryBoard(ItemProviderEntry component, String schematicPath, PonderStoryBoard storyBoard, PonderTag... tags) { ResourceLocation id = component.getId(); - PonderStoryBoardEntry entry = new PonderStoryBoardEntry(storyBoard, schematic, id); + PonderStoryBoardEntry entry = new PonderStoryBoardEntry(storyBoard, getNamespaceOrThrow(), schematicPath, id); PonderSceneBuilder builder = new PonderSceneBuilder(entry); if (tags.length > 0) builder.highlightTags(tags); - all.computeIfAbsent(id, _$ -> new ArrayList<>()) + ALL.computeIfAbsent(id, _$ -> new ArrayList<>()) .add(entry); return builder; } - public static PonderSceneBuilder addStoryBoard(PonderChapter chapter, ResourceLocation component, String schematic, - PonderStoryBoard storyBoard) { + public static PonderSceneBuilder addStoryBoard(PonderChapter chapter, ResourceLocation component, String schematicPath, PonderStoryBoard storyBoard) { if (component == null) component = new ResourceLocation("minecraft", "stick"); - PonderStoryBoardEntry entry = new PonderStoryBoardEntry(storyBoard, schematic, component); + PonderStoryBoardEntry entry = new PonderStoryBoardEntry(storyBoard, getNamespaceOrThrow(), schematicPath, component); PonderSceneBuilder builder = new PonderSceneBuilder(entry); - chapters.addStoriesToChapter(chapter, entry); + CHAPTERS.addStoriesToChapter(chapter, entry); return builder; } public static MultiSceneBuilder forComponents(ItemProviderEntry... components) { return new MultiSceneBuilder(Arrays.asList(components)); } - + public static MultiSceneBuilder forComponents(Iterable> components) { return new MultiSceneBuilder(components); } public static List compile(ResourceLocation id) { - return compile(all.get(id)); + return compile(ALL.get(id)); } public static List compile(PonderChapter chapter) { - return compile(chapters.getStories(chapter)); + return compile(CHAPTERS.getStories(chapter)); } public static List compile(List entries) { if (PonderIndex.EDITOR_MODE) { - PonderLocalization.shared.clear(); + PonderLocalization.SHARED.clear(); SharedText.gatherText(); } @@ -87,7 +111,7 @@ public class PonderRegistry { for (int i = 0; i < entries.size(); i++) { PonderStoryBoardEntry sb = entries.get(i); - Template activeTemplate = loadSchematic(sb.getSchematicName()); + Template activeTemplate = loadSchematic(sb.getSchematicLocation()); PonderWorld world = new PonderWorld(BlockPos.ZERO, Minecraft.getInstance().level); activeTemplate.placeInWorld(world, BlockPos.ZERO, new PlacementSettings(), world.random); world.createBackup(); @@ -100,41 +124,42 @@ public class PonderRegistry { } public static PonderScene compileScene(int i, PonderStoryBoardEntry sb, PonderWorld world) { - PonderScene scene = new PonderScene(world, sb.getComponent(), sb.getTags()); + PonderScene scene = new PonderScene(world, sb.getNamespace(), sb.getComponent(), sb.getTags()); SceneBuilder builder = scene.builder(); sb.getBoard() .program(builder, scene.getSceneBuildingUtil()); return scene; } - public static Template loadSchematic(String path) { - Template t = new Template(); - String filepath = "ponder/" + path + ".nbt"; - InputStream resourceAsStream = Create.class.getClassLoader() - .getResourceAsStream(filepath); - if (resourceAsStream == null) { - Create.LOGGER.error("Ponder schematic missing: " + path); - return t; - } - try (DataInputStream stream = - new DataInputStream(new BufferedInputStream(new GZIPInputStream(resourceAsStream)))) { - CompoundNBT nbt = CompressedStreamTools.read(stream, new NBTSizeTracker(0x20000000L)); - t.load(nbt); - } catch (IOException e) { - Create.LOGGER.warn("Failed to read ponder schematic", e); - } - return t; + public static Template loadSchematic(ResourceLocation location) { + return loadSchematic(Minecraft.getInstance().getResourceManager(), location); } - public static JsonElement provideLangEntries() { - PonderIndex.register(); - PonderTag.register(); - SharedText.gatherText(); - all.forEach((id, list) -> { - for (int i = 0; i < list.size(); i++) - compileScene(i, list.get(i), null); - }); - return PonderLocalization.record(); + public static Template loadSchematic(IResourceManager resourceManager, ResourceLocation location) { + String namespace = location.getNamespace(); + String path = "ponder/" + location.getPath() + ".nbt"; + ResourceLocation location1 = new ResourceLocation(namespace, path); + + if (!resourceManager.hasResource(location1)) { + Create.LOGGER.error("Ponder schematic missing: " + location1); + return new Template(); + } + try { + IResource resource = resourceManager.getResource(location1); + return loadSchematic(resource.getInputStream()); + } catch (IOException e) { + Create.LOGGER.error("Failed to read ponder schematic: " + path, e); + } + return new Template(); + } + + public static Template loadSchematic(InputStream resourceStream) throws IOException { + Template t = new Template(); + DataInputStream stream = + new DataInputStream(new BufferedInputStream(new GZIPInputStream(resourceStream))); + CompoundNBT nbt = CompressedStreamTools.read(stream, new NBTSizeTracker(0x20000000L)); + t.load(nbt); + return t; } public static class MultiSceneBuilder { @@ -183,7 +208,7 @@ public class PonderRegistry { } public PonderSceneBuilder chapter(PonderChapter chapter) { - PonderRegistry.chapters.addStoriesToChapter(chapter, entry); + PonderRegistry.CHAPTERS.addStoriesToChapter(chapter, entry); return this; } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java index f1942fba6..c5bbdacef 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java @@ -59,7 +59,7 @@ public class PonderScene { boolean finished; int sceneIndex; int textIndex; - String sceneId; + ResourceLocation sceneId; IntList keyframeTimes; @@ -69,6 +69,7 @@ public class PonderScene { List tags; PonderWorld world; + String namespace; ResourceLocation component; SceneTransform transform; SceneRenderInfo info; @@ -90,7 +91,7 @@ public class PonderScene { int totalTime; int currentTime; - public PonderScene(PonderWorld world, ResourceLocation component, Collection tags) { + public PonderScene(PonderWorld world, String namespace, ResourceLocation component, Collection tags) { if (world != null) world.scene = this; @@ -98,6 +99,7 @@ public class PonderScene { textIndex = 1; this.world = world; + this.namespace = namespace; this.component = component; outliner = new Outliner(); @@ -392,10 +394,30 @@ public class PonderScene { return new SceneBuildingUtil(getBounds()); } + public String getNamespace() { + return namespace; + } + + public ResourceLocation getId() { + return sceneId; + } + public SceneTransform getTransform() { return transform; } + public Outliner getOutliner() { + return outliner; + } + + public boolean isFinished() { + return finished; + } + + public void setFinished(boolean finished) { + this.finished = finished; + } + public class SceneTransform { public LerpedFloat xRotation, yRotation; @@ -513,16 +535,4 @@ public class PonderScene { } - public Outliner getOutliner() { - return outliner; - } - - public boolean isFinished() { - return finished; - } - - public void setFinished(boolean finished) { - this.finished = finished; - } - } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderStoryBoardEntry.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderStoryBoardEntry.java index 6d6ab1c98..5938d38e8 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/PonderStoryBoardEntry.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderStoryBoardEntry.java @@ -9,36 +9,47 @@ import net.minecraft.util.ResourceLocation; public class PonderStoryBoardEntry { - private final String schematicName; private final PonderStoryBoard board; - private final List tags; + private final String namespace; + private final String schematicPath; private final ResourceLocation component; + private final List tags; - public PonderStoryBoardEntry(PonderStoryBoard board, String schematicName, ResourceLocation component) { + public PonderStoryBoardEntry(PonderStoryBoard board, String namespace, String schematicPath, ResourceLocation component) { this.board = board; - this.schematicName = schematicName; - this.tags = new ArrayList<>(); + this.namespace = namespace; + this.schematicPath = schematicPath; this.component = component; - } - - public interface PonderStoryBoard { - void program(SceneBuilder scene, SceneBuildingUtil util); - } - - public String getSchematicName() { - return schematicName; + this.tags = new ArrayList<>(); } public PonderStoryBoard getBoard() { return board; } - public List getTags() { - return tags; + public String getNamespace() { + return namespace; + } + + public String getSchematicPath() { + return schematicPath; } public ResourceLocation getComponent() { return component; } + public List getTags() { + return tags; + } + + public ResourceLocation getSchematicLocation() { + return new ResourceLocation(namespace, schematicPath); + } + + @FunctionalInterface + public interface PonderStoryBoard { + void program(SceneBuilder scene, SceneBuildingUtil util); + } + } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderTooltipHandler.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderTooltipHandler.java index a47304a31..a04832908 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/PonderTooltipHandler.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderTooltipHandler.java @@ -102,7 +102,7 @@ public class PonderTooltipHandler { if (stack.isEmpty()) return; - if (!PonderRegistry.all.containsKey(stack.getItem() + if (!PonderRegistry.ALL.containsKey(stack.getItem() .getRegistryName())) return; diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java index ddf6de0f7..ae5eb3bee 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java @@ -13,6 +13,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; +import com.simibubi.create.Create; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.AllIcons; @@ -137,11 +138,11 @@ public class PonderUI extends NavigatableSimiScreen { else stack = new ItemStack(ForgeRegistries.BLOCKS.getValue(component)); - tags = new ArrayList<>(PonderRegistry.tags.getTags(component)); + tags = new ArrayList<>(PonderRegistry.TAGS.getTags(component)); this.scenes = scenes; if (scenes.isEmpty()) { List l = Collections.singletonList(new PonderStoryBoardEntry(DebugScenes::empty, - "debug/scene_1", new ResourceLocation("minecraft", "stick"))); + Create.ID, "debug/scene_1", new ResourceLocation("minecraft", "stick"))); scenes.addAll(PonderRegistry.compile(l)); } lazyIndex = LerpedFloat.linear() @@ -365,9 +366,9 @@ public class PonderUI extends NavigatableSimiScreen { PonderScene scene = scenes.get(index); if (hasShiftDown()) { - List list = PonderRegistry.all.get(scene.component); + List list = PonderRegistry.ALL.get(scene.component); PonderStoryBoardEntry sb = list.get(index); - Template activeTemplate = PonderRegistry.loadSchematic(sb.getSchematicName()); + Template activeTemplate = PonderRegistry.loadSchematic(sb.getSchematicLocation()); PonderWorld world = new PonderWorld(BlockPos.ZERO, Minecraft.getInstance().level); activeTemplate.placeInWorld(world, BlockPos.ZERO, new PlacementSettings(), new Random()); world.createBackup(); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/SceneBuilder.java b/src/main/java/com/simibubi/create/foundation/ponder/SceneBuilder.java index dbecedced..108351609 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/SceneBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/SceneBuilder.java @@ -76,14 +76,13 @@ import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3i; import net.minecraft.world.World; -import com.simibubi.create.foundation.ponder.elements.TextWindowElement.Builder; - /** * Enqueue instructions to the schedule via this object's methods. */ @@ -138,8 +137,8 @@ public class SceneBuilder { * @param title */ public void title(String sceneId, String title) { - scene.sceneId = sceneId; - PonderLocalization.registerSpecific(sceneId, PonderScene.TITLE_KEY, title); + scene.sceneId = new ResourceLocation(scene.namespace, sceneId); + PonderLocalization.registerSpecific(scene.sceneId, PonderScene.TITLE_KEY, title); } /** diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderChapter.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderChapter.java index 7508bd85a..9bedf775d 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderChapter.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderChapter.java @@ -33,9 +33,9 @@ public class PonderChapter implements IScreenRenderable { @Nonnull public static PonderChapter of(String id) { - PonderChapter chapter = PonderRegistry.chapters.getChapter(id); + PonderChapter chapter = PonderRegistry.CHAPTERS.getChapter(id); if (chapter == null) { - chapter = PonderRegistry.chapters.addChapter(new PonderChapter(id)); + chapter = PonderRegistry.CHAPTERS.addChapter(new PonderChapter(id)); } return chapter; @@ -43,7 +43,7 @@ public class PonderChapter implements IScreenRenderable { public PonderChapter addTagsToChapter(PonderTag... tags) { for (PonderTag t : tags) - PonderRegistry.tags.add(t, this); + PonderRegistry.TAGS.add(t, this); return this; } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java index a61068eb9..62241e7fc 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java @@ -2,6 +2,7 @@ package com.simibubi.create.foundation.ponder.content; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; +import com.simibubi.create.Create; import com.simibubi.create.foundation.ponder.PonderRegistry; import com.simibubi.create.foundation.ponder.content.fluid.DrainScenes; import com.simibubi.create.foundation.ponder.content.fluid.FluidMovementActorScenes; @@ -19,6 +20,8 @@ public class PonderIndex { public static final boolean EDITOR_MODE = false; public static void register() { + PonderRegistry.startRegistration(Create.ID); + // Register storyboards here // (!) Added entries require re-launch // (!) Modifications inside storyboard methods only require re-opening the ui @@ -293,12 +296,14 @@ public class PonderIndex { // Debug scenes, can be found in game via the Brass Hand if (EDITOR_MODE) DebugScenes.registerAll(); + + PonderRegistry.endRegistration(); } public static void registerTags() { // Add items to tags here - PonderRegistry.tags.forTag(PonderTag.KINETIC_RELAYS) + PonderRegistry.TAGS.forTag(PonderTag.KINETIC_RELAYS) .add(AllBlocks.SHAFT) .add(AllBlocks.COGWHEEL) .add(AllBlocks.LARGE_COGWHEEL) @@ -311,7 +316,7 @@ public class PonderIndex { .add(AllBlocks.SEQUENCED_GEARSHIFT) .add(AllBlocks.ROTATION_SPEED_CONTROLLER); - PonderRegistry.tags.forTag(PonderTag.KINETIC_SOURCES) + PonderRegistry.TAGS.forTag(PonderTag.KINETIC_SOURCES) .add(AllBlocks.HAND_CRANK) .add(AllBlocks.COPPER_VALVE_HANDLE) .add(AllBlocks.WATER_WHEEL) @@ -321,7 +326,7 @@ public class PonderIndex { .add(AllBlocks.FLYWHEEL) .add(AllBlocks.CREATIVE_MOTOR); - PonderRegistry.tags.forTag(PonderTag.KINETIC_APPLIANCES) + PonderRegistry.TAGS.forTag(PonderTag.KINETIC_APPLIANCES) .add(AllBlocks.MILLSTONE) .add(AllBlocks.TURNTABLE) .add(AllBlocks.ENCASED_FAN) @@ -342,7 +347,7 @@ public class PonderIndex { .add(AllBlocks.CLOCKWORK_BEARING) .add(AllBlocks.CRUSHING_WHEEL); - PonderRegistry.tags.forTag(PonderTag.FLUIDS) + PonderRegistry.TAGS.forTag(PonderTag.FLUIDS) .add(AllBlocks.FLUID_PIPE) .add(AllBlocks.MECHANICAL_PUMP) .add(AllBlocks.FLUID_VALVE) @@ -354,7 +359,7 @@ public class PonderIndex { .add(AllBlocks.FLUID_TANK) .add(AllBlocks.CREATIVE_FLUID_TANK); - PonderRegistry.tags.forTag(PonderTag.ARM_TARGETS) + PonderRegistry.TAGS.forTag(PonderTag.ARM_TARGETS) .add(AllBlocks.MECHANICAL_ARM) .add(AllItems.BELT_CONNECTOR) .add(AllBlocks.CHUTE) @@ -372,7 +377,7 @@ public class PonderIndex { .add(Blocks.COMPOSTER) .add(Blocks.JUKEBOX); - PonderRegistry.tags.forTag(PonderTag.LOGISTICS) + PonderRegistry.TAGS.forTag(PonderTag.LOGISTICS) .add(AllItems.BELT_CONNECTOR) .add(AllItems.FILTER) .add(AllItems.ATTRIBUTE_FILTER) @@ -391,7 +396,7 @@ public class PonderIndex { .add(AllBlocks.CREATIVE_CRATE) .add(AllBlocks.PORTABLE_STORAGE_INTERFACE); - PonderRegistry.tags.forTag(PonderTag.DECORATION) + PonderRegistry.TAGS.forTag(PonderTag.DECORATION) .add(AllBlocks.ORANGE_NIXIE_TUBE) .add(AllBlocks.CUCKOO_CLOCK) .add(AllBlocks.WOODEN_BRACKET) @@ -400,17 +405,17 @@ public class PonderIndex { .add(AllBlocks.BRASS_CASING) .add(AllBlocks.COPPER_CASING); - PonderRegistry.tags.forTag(PonderTag.CREATIVE) + PonderRegistry.TAGS.forTag(PonderTag.CREATIVE) .add(AllBlocks.CREATIVE_CRATE) .add(AllBlocks.CREATIVE_FLUID_TANK) .add(AllBlocks.CREATIVE_MOTOR); - PonderRegistry.tags.forTag(PonderTag.SAILS) + PonderRegistry.TAGS.forTag(PonderTag.SAILS) .add(AllBlocks.SAIL) .add(AllBlocks.SAIL_FRAME) .add(Blocks.WHITE_WOOL); - PonderRegistry.tags.forTag(PonderTag.REDSTONE) + PonderRegistry.TAGS.forTag(PonderTag.REDSTONE) .add(AllBlocks.ORANGE_NIXIE_TUBE) .add(AllBlocks.REDSTONE_CONTACT) .add(AllBlocks.ANALOG_LEVER) @@ -421,7 +426,7 @@ public class PonderIndex { .add(AllBlocks.POWERED_LATCH) .add(AllBlocks.POWERED_TOGGLE_LATCH); - PonderRegistry.tags.forTag(PonderTag.MOVEMENT_ANCHOR) + PonderRegistry.TAGS.forTag(PonderTag.MOVEMENT_ANCHOR) .add(AllBlocks.MECHANICAL_PISTON) .add(AllBlocks.WINDMILL_BEARING) .add(AllBlocks.MECHANICAL_BEARING) @@ -430,7 +435,7 @@ public class PonderIndex { .add(AllBlocks.GANTRY_CARRIAGE) .add(AllBlocks.CART_ASSEMBLER); - PonderRegistry.tags.forTag(PonderTag.CONTRAPTION_ASSEMBLY) + PonderRegistry.TAGS.forTag(PonderTag.CONTRAPTION_ASSEMBLY) .add(AllBlocks.LINEAR_CHASSIS) .add(AllBlocks.SECONDARY_LINEAR_CHASSIS) .add(AllBlocks.RADIAL_CHASSIS) @@ -439,7 +444,7 @@ public class PonderIndex { .add(Blocks.SLIME_BLOCK) .add(Blocks.HONEY_BLOCK); - PonderRegistry.tags.forTag(PonderTag.CONTRAPTION_ACTOR) + PonderRegistry.TAGS.forTag(PonderTag.CONTRAPTION_ACTOR) .add(AllBlocks.MECHANICAL_HARVESTER) .add(AllBlocks.MECHANICAL_PLOUGH) .add(AllBlocks.MECHANICAL_DRILL) @@ -455,7 +460,6 @@ public class PonderIndex { .add(Blocks.BELL) .add(Blocks.DISPENSER) .add(Blocks.DROPPER); - } } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java index ee2141bb4..5a140bf69 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java @@ -55,7 +55,7 @@ public class PonderIndexScreen extends NavigatableSimiScreen { // chapters.addAll(PonderRegistry.chapters.getAllChapters()); items.clear(); - PonderRegistry.all.keySet() + PonderRegistry.ALL.keySet() .stream() .map(key -> { Item item = ForgeRegistries.ITEMS.getValue(key); @@ -108,7 +108,7 @@ public class PonderIndexScreen extends NavigatableSimiScreen { PonderButton b = new PonderButton(itemCenterX + layout.getX() + 4, itemCenterY + layout.getY() + 4) .showing(new ItemStack(item)) .withCallback((x, y) -> { - if (!PonderRegistry.all.containsKey(item.getRegistryName())) + if (!PonderRegistry.ALL.containsKey(item.getRegistryName())) return; centerScalingOn(x, y); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTag.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTag.java index 2eef66adf..f96f8e5eb 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTag.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTag.java @@ -6,6 +6,7 @@ import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; +import com.simibubi.create.Create; import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.gui.IScreenRenderable; import com.simibubi.create.foundation.ponder.PonderLocalization; @@ -26,65 +27,65 @@ public class PonderTag implements IScreenRenderable { public static final PonderTag - KINETIC_RELAYS = new PonderTag("kinetic_relays").item(AllBlocks.COGWHEEL.get(), true, false) + KINETIC_RELAYS = create("kinetic_relays").item(AllBlocks.COGWHEEL.get(), true, false) .defaultLang("Kinetic Blocks", "Components which help relaying Rotational Force elsewhere") .addToIndex(), - KINETIC_SOURCES = new PonderTag("kinetic_sources").item(AllBlocks.WATER_WHEEL.get(), true, false) + KINETIC_SOURCES = create("kinetic_sources").item(AllBlocks.WATER_WHEEL.get(), true, false) .defaultLang("Kinetic Sources", "Components which generate Rotational Force") .addToIndex(), - KINETIC_APPLIANCES = new PonderTag("kinetic_appliances").item(AllBlocks.MECHANICAL_PRESS.get(), true, false) + KINETIC_APPLIANCES = create("kinetic_appliances").item(AllBlocks.MECHANICAL_PRESS.get(), true, false) .defaultLang("Kinetic Appliances", "Components which make use of Rotational Force") .addToIndex(), - FLUIDS = new PonderTag("fluids").item(AllBlocks.FLUID_PIPE.get(), true, false) + FLUIDS = create("fluids").item(AllBlocks.FLUID_PIPE.get(), true, false) .defaultLang("Fluid Manipulators", "Components which help relaying and making use of Fluids") .addToIndex(), - LOGISTICS = new PonderTag("logistics").item(Blocks.CHEST, true, false) + LOGISTICS = create("logistics").item(Blocks.CHEST, true, false) .defaultLang("Item Transportation", "Components which help moving items around") .addToIndex(), - REDSTONE = new PonderTag("redstone").item(Items.REDSTONE, true, false) + REDSTONE = create("redstone").item(Items.REDSTONE, true, false) .defaultLang("Logic Components", "Components which help with redstone engineering") .addToIndex(), - DECORATION = new PonderTag("decoration").item(Items.ROSE_BUSH, true, false) + DECORATION = create("decoration").item(Items.ROSE_BUSH, true, false) .defaultLang("Aesthetics", "Components used mostly for decorative purposes"), - CREATIVE = new PonderTag("creative").item(AllBlocks.CREATIVE_CRATE.get(), true, false) + CREATIVE = create("creative").item(AllBlocks.CREATIVE_CRATE.get(), true, false) .defaultLang("Creative Mode", "Components not usually available for Survival Mode") .addToIndex(), - MOVEMENT_ANCHOR = new PonderTag("movement_anchor").item(AllBlocks.MECHANICAL_PISTON.get(), true, false) + MOVEMENT_ANCHOR = create("movement_anchor").item(AllBlocks.MECHANICAL_PISTON.get(), true, false) .defaultLang("Movement Anchors", "Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways") .addToIndex(), - CONTRAPTION_ACTOR = new PonderTag("contraption_actor").item(AllBlocks.MECHANICAL_HARVESTER.get(), true, false) + CONTRAPTION_ACTOR = create("contraption_actor").item(AllBlocks.MECHANICAL_HARVESTER.get(), true, false) .defaultLang("Contraption Actors", "Components which expose special behaviour when attached to a moving contraption") .addToIndex(), - CONTRAPTION_ASSEMBLY = new PonderTag("contraption_assembly").item(AllItems.SUPER_GLUE.get(), true, false) + CONTRAPTION_ASSEMBLY = create("contraption_assembly").item(AllItems.SUPER_GLUE.get(), true, false) .defaultLang("Block Attachment Utility", "Tools and Components used to assemble structures moved as an animated Contraption") .addToIndex(), - SAILS = new PonderTag("windmill_sails").item(AllBlocks.WINDMILL_BEARING.get(), true, true) + SAILS = create("windmill_sails").item(AllBlocks.WINDMILL_BEARING.get(), true, true) .defaultLang("Sails for Windmill Bearings", "Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so."), - ARM_TARGETS = new PonderTag("arm_targets").item(AllBlocks.MECHANICAL_ARM.get()) + ARM_TARGETS = create("arm_targets").item(AllBlocks.MECHANICAL_ARM.get()) .defaultLang("Targets for Mechanical Arms", "Components which can be selected as inputs or outputs to the Mechanical Arm"); public static class Highlight { - public static final PonderTag ALL = new PonderTag("_all"); + public static final PonderTag ALL = create("_all"); } - private final String id; + private final ResourceLocation id; private ResourceLocation icon; private ItemStack itemIcon = ItemStack.EMPTY; private ItemStack mainItem = ItemStack.EMPTY; @@ -99,11 +100,11 @@ public class PonderTag implements IScreenRenderable { // Builder - public PonderTag(String id) { + public PonderTag(ResourceLocation id) { this.id = id; } - public String getId() { + public ResourceLocation getId() { return id; } @@ -126,7 +127,12 @@ public class PonderTag implements IScreenRenderable { } public PonderTag icon(String location) { - this.icon = new ResourceLocation(com.simibubi.create.Create.ID, "textures/ponder/tag/" + location + ".png"); + this.icon = new ResourceLocation(id.getNamespace(), "textures/ponder/tag/" + location + ".png"); + return this; + } + + public PonderTag icon(ResourceLocation location) { + this.icon = new ResourceLocation(location.getNamespace(), "textures/ponder/tag/" + location.getPath() + ".png"); return this; } @@ -164,6 +170,10 @@ public class PonderTag implements IScreenRenderable { ms.popPose(); } + private static PonderTag create(String id) { + return new PonderTag(Create.asResource(id)); + } + // Load class public static void register() {} diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagRegistry.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagRegistry.java index 9ff0a6763..f13fc6cdc 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagRegistry.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagRegistry.java @@ -73,7 +73,7 @@ public class PonderTagRegistry { } public ItemBuilder add(PonderTag tag) { - items.forEach(i -> PonderRegistry.tags.add(tag, i)); + items.forEach(i -> PonderRegistry.TAGS.add(tag, i)); return this; } @@ -88,7 +88,7 @@ public class PonderTagRegistry { } public TagBuilder add(ResourceLocation item) { - PonderRegistry.tags.add(tag, item); + PonderRegistry.TAGS.add(tag, item); return this; } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java index 5b85fa1e0..203c4890f 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java @@ -60,7 +60,7 @@ public class PonderTagScreen extends NavigatableSimiScreen { // items items.clear(); - PonderRegistry.tags.getItems(tag) + PonderRegistry.TAGS.getItems(tag) .stream() .map(key -> { Item item = ForgeRegistries.ITEMS.getValue(key); @@ -87,7 +87,7 @@ public class PonderTagScreen extends NavigatableSimiScreen { PonderButton b = new PonderButton(itemCenterX + layout.getX() + 4, itemCenterY + layout.getY() + 4) .showing(new ItemStack(i)); - if (PonderRegistry.all.containsKey(i.getRegistryName())) { + if (PonderRegistry.ALL.containsKey(i.getRegistryName())) { b.withCallback((mouseX, mouseY) -> { centerScalingOn(mouseX, mouseY); ScreenOpener.transitionTo(PonderUI.of(new ItemStack(i), tag)); @@ -115,7 +115,7 @@ public class PonderTagScreen extends NavigatableSimiScreen { PonderButton b = new PonderButton(itemCenterX - layout.getTotalWidth() / 2 - 42, itemCenterY - 10) .showing(tag.getMainItem()); - if (PonderRegistry.all.containsKey(registryName)) { + if (PonderRegistry.ALL.containsKey(registryName)) { b.withCallback((mouseX, mouseY) -> { centerScalingOn(mouseX, mouseY); ScreenOpener.transitionTo(PonderUI.of(tag.getMainItem(), tag)); @@ -135,7 +135,7 @@ public class PonderTagScreen extends NavigatableSimiScreen { // chapters chapters.clear(); - chapters.addAll(PonderRegistry.tags.getChapters(tag)); + chapters.addAll(PonderRegistry.TAGS.getChapters(tag)); rowCount = MathHelper.clamp((int) Math.ceil(chapters.size() / 3f), 1, 3); layout = LayoutHelper.centeredHorizontal(chapters.size(), rowCount, 200, 38, 16); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/SharedText.java b/src/main/java/com/simibubi/create/foundation/ponder/content/SharedText.java index bd83c5bd6..7875705ac 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/SharedText.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/SharedText.java @@ -1,7 +1,10 @@ package com.simibubi.create.foundation.ponder.content; +import com.simibubi.create.Create; import com.simibubi.create.foundation.ponder.PonderLocalization; +import net.minecraft.util.ResourceLocation; + public class SharedText { public static void gatherText() { @@ -18,15 +21,18 @@ public class SharedText { add("movement_anchors", "With the help of Chassis or Super Glue, larger structures can be moved."); add("behaviour_modify_wrench", "This behaviour can be modified using a Wrench"); add("storage_on_contraption", "Inventories attached to the Contraption will pick up their drops automatically"); - } - public static String get(String key) { + public static String get(ResourceLocation key) { return PonderLocalization.getShared(key); } - private static void add(String k, String v) { + public static void add(ResourceLocation k, String v) { PonderLocalization.registerShared(k, v); } + private static void add(String k, String v) { + add(Create.asResource(k), v); + } + } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/elements/InputWindowElement.java b/src/main/java/com/simibubi/create/foundation/ponder/elements/InputWindowElement.java index b7e2b9e10..b99fb8b1b 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/elements/InputWindowElement.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/elements/InputWindowElement.java @@ -3,6 +3,7 @@ package com.simibubi.create.foundation.ponder.elements; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllItems; +import com.simibubi.create.Create; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.ponder.PonderLocalization; @@ -14,13 +15,14 @@ import com.simibubi.create.foundation.utility.Pointing; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.vector.Vector2f; import net.minecraft.util.math.vector.Vector3d; public class InputWindowElement extends AnimatedOverlayElement { private Pointing direction; - String key; + ResourceLocation key; AllIcons icon; ItemStack item = ItemStack.EMPTY; private Vector3d sceneSpace; @@ -69,12 +71,12 @@ public class InputWindowElement extends AnimatedOverlayElement { } public InputWindowElement whileSneaking() { - key = "sneak_and"; + key = Create.asResource("sneak_and"); return this; } public InputWindowElement whileCTRL() { - key = "ctrl_and"; + key = Create.asResource("ctrl_and"); return this; } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/elements/TextWindowElement.java b/src/main/java/com/simibubi/create/foundation/ponder/elements/TextWindowElement.java index 34c20efdc..aef8a7a25 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/elements/TextWindowElement.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/elements/TextWindowElement.java @@ -12,6 +12,7 @@ import com.simibubi.create.foundation.ponder.PonderUI; import com.simibubi.create.foundation.ponder.content.PonderPalette; import com.simibubi.create.foundation.utility.ColorHelper; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector2f; @@ -65,11 +66,15 @@ public class TextWindowElement extends AnimatedOverlayElement { return this; } - public Builder sharedText(String key) { + public Builder sharedText(ResourceLocation key) { textGetter = () -> PonderLocalization.getShared(key); return this; } + public Builder sharedText(String key) { + return sharedText(new ResourceLocation(scene.getNamespace(), key)); + } + public Builder placeNearTarget() { TextWindowElement.this.nearScene = true; return this; diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/fluid/SmartFluidTankBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/fluid/SmartFluidTankBehaviour.java index a78883b78..96be1251a 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/fluid/SmartFluidTankBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/fluid/SmartFluidTankBehaviour.java @@ -20,8 +20,6 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; - public class SmartFluidTankBehaviour extends TileEntityBehaviour { public static BehaviourType diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenFeatureEntry.java b/src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenFeatureEntry.java index 78c8edd04..0d6eeb8ce 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenFeatureEntry.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenFeatureEntry.java @@ -10,9 +10,6 @@ import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.OreFeatureConfig.FillerBlockType; import net.minecraftforge.common.ForgeConfigSpec; -import com.simibubi.create.foundation.config.ConfigBase.ConfigFloat; -import com.simibubi.create.foundation.config.ConfigBase.ConfigInt; - public class ConfigDrivenFeatureEntry extends ConfigBase { public final String id; diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java b/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java index 6793a7bf9..d58fa40a6 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java @@ -21,8 +21,6 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.block.AbstractBlock.Properties; - public class OxidizingBlock extends Block { public static final IntegerProperty OXIDIZATION = IntegerProperty.create("oxidization", 0, 7); diff --git a/src/main/resources/ponder/adjustable_pulse_repeater.nbt b/src/main/resources/assets/create/ponder/adjustable_pulse_repeater.nbt similarity index 100% rename from src/main/resources/ponder/adjustable_pulse_repeater.nbt rename to src/main/resources/assets/create/ponder/adjustable_pulse_repeater.nbt diff --git a/src/main/resources/ponder/adjustable_repeater.nbt b/src/main/resources/assets/create/ponder/adjustable_repeater.nbt similarity index 100% rename from src/main/resources/ponder/adjustable_repeater.nbt rename to src/main/resources/assets/create/ponder/adjustable_repeater.nbt diff --git a/src/main/resources/ponder/analog_lever.nbt b/src/main/resources/assets/create/ponder/analog_lever.nbt similarity index 100% rename from src/main/resources/ponder/analog_lever.nbt rename to src/main/resources/assets/create/ponder/analog_lever.nbt diff --git a/src/main/resources/ponder/basin.nbt b/src/main/resources/assets/create/ponder/basin.nbt similarity index 100% rename from src/main/resources/ponder/basin.nbt rename to src/main/resources/assets/create/ponder/basin.nbt diff --git a/src/main/resources/ponder/belt/connect.nbt b/src/main/resources/assets/create/ponder/belt/connect.nbt similarity index 100% rename from src/main/resources/ponder/belt/connect.nbt rename to src/main/resources/assets/create/ponder/belt/connect.nbt diff --git a/src/main/resources/ponder/belt/directions.nbt b/src/main/resources/assets/create/ponder/belt/directions.nbt similarity index 100% rename from src/main/resources/ponder/belt/directions.nbt rename to src/main/resources/assets/create/ponder/belt/directions.nbt diff --git a/src/main/resources/ponder/belt/encasing.nbt b/src/main/resources/assets/create/ponder/belt/encasing.nbt similarity index 100% rename from src/main/resources/ponder/belt/encasing.nbt rename to src/main/resources/assets/create/ponder/belt/encasing.nbt diff --git a/src/main/resources/ponder/belt/transport.nbt b/src/main/resources/assets/create/ponder/belt/transport.nbt similarity index 100% rename from src/main/resources/ponder/belt/transport.nbt rename to src/main/resources/assets/create/ponder/belt/transport.nbt diff --git a/src/main/resources/ponder/blaze_burner.nbt b/src/main/resources/assets/create/ponder/blaze_burner.nbt similarity index 100% rename from src/main/resources/ponder/blaze_burner.nbt rename to src/main/resources/assets/create/ponder/blaze_burner.nbt diff --git a/src/main/resources/ponder/cart_assembler/anchor.nbt b/src/main/resources/assets/create/ponder/cart_assembler/anchor.nbt similarity index 100% rename from src/main/resources/ponder/cart_assembler/anchor.nbt rename to src/main/resources/assets/create/ponder/cart_assembler/anchor.nbt diff --git a/src/main/resources/ponder/cart_assembler/dual.nbt b/src/main/resources/assets/create/ponder/cart_assembler/dual.nbt similarity index 100% rename from src/main/resources/ponder/cart_assembler/dual.nbt rename to src/main/resources/assets/create/ponder/cart_assembler/dual.nbt diff --git a/src/main/resources/ponder/cart_assembler/modes.nbt b/src/main/resources/assets/create/ponder/cart_assembler/modes.nbt similarity index 100% rename from src/main/resources/ponder/cart_assembler/modes.nbt rename to src/main/resources/assets/create/ponder/cart_assembler/modes.nbt diff --git a/src/main/resources/ponder/cart_assembler/rails.nbt b/src/main/resources/assets/create/ponder/cart_assembler/rails.nbt similarity index 100% rename from src/main/resources/ponder/cart_assembler/rails.nbt rename to src/main/resources/assets/create/ponder/cart_assembler/rails.nbt diff --git a/src/main/resources/ponder/chain_drive/gearshift.nbt b/src/main/resources/assets/create/ponder/chain_drive/gearshift.nbt similarity index 100% rename from src/main/resources/ponder/chain_drive/gearshift.nbt rename to src/main/resources/assets/create/ponder/chain_drive/gearshift.nbt diff --git a/src/main/resources/ponder/chain_drive/relay.nbt b/src/main/resources/assets/create/ponder/chain_drive/relay.nbt similarity index 100% rename from src/main/resources/ponder/chain_drive/relay.nbt rename to src/main/resources/assets/create/ponder/chain_drive/relay.nbt diff --git a/src/main/resources/ponder/chassis/linear_attachment.nbt b/src/main/resources/assets/create/ponder/chassis/linear_attachment.nbt similarity index 100% rename from src/main/resources/ponder/chassis/linear_attachment.nbt rename to src/main/resources/assets/create/ponder/chassis/linear_attachment.nbt diff --git a/src/main/resources/ponder/chassis/linear_group.nbt b/src/main/resources/assets/create/ponder/chassis/linear_group.nbt similarity index 100% rename from src/main/resources/ponder/chassis/linear_group.nbt rename to src/main/resources/assets/create/ponder/chassis/linear_group.nbt diff --git a/src/main/resources/ponder/chassis/radial.nbt b/src/main/resources/assets/create/ponder/chassis/radial.nbt similarity index 100% rename from src/main/resources/ponder/chassis/radial.nbt rename to src/main/resources/assets/create/ponder/chassis/radial.nbt diff --git a/src/main/resources/ponder/chute/downward.nbt b/src/main/resources/assets/create/ponder/chute/downward.nbt similarity index 100% rename from src/main/resources/ponder/chute/downward.nbt rename to src/main/resources/assets/create/ponder/chute/downward.nbt diff --git a/src/main/resources/ponder/chute/smart.nbt b/src/main/resources/assets/create/ponder/chute/smart.nbt similarity index 100% rename from src/main/resources/ponder/chute/smart.nbt rename to src/main/resources/assets/create/ponder/chute/smart.nbt diff --git a/src/main/resources/ponder/chute/upward.nbt b/src/main/resources/assets/create/ponder/chute/upward.nbt similarity index 100% rename from src/main/resources/ponder/chute/upward.nbt rename to src/main/resources/assets/create/ponder/chute/upward.nbt diff --git a/src/main/resources/ponder/clockwork_bearing.nbt b/src/main/resources/assets/create/ponder/clockwork_bearing.nbt similarity index 100% rename from src/main/resources/ponder/clockwork_bearing.nbt rename to src/main/resources/assets/create/ponder/clockwork_bearing.nbt diff --git a/src/main/resources/ponder/clutch.nbt b/src/main/resources/assets/create/ponder/clutch.nbt similarity index 100% rename from src/main/resources/ponder/clutch.nbt rename to src/main/resources/assets/create/ponder/clutch.nbt diff --git a/src/main/resources/ponder/cog/large.nbt b/src/main/resources/assets/create/ponder/cog/large.nbt similarity index 100% rename from src/main/resources/ponder/cog/large.nbt rename to src/main/resources/assets/create/ponder/cog/large.nbt diff --git a/src/main/resources/ponder/cog/small.nbt b/src/main/resources/assets/create/ponder/cog/small.nbt similarity index 100% rename from src/main/resources/ponder/cog/small.nbt rename to src/main/resources/assets/create/ponder/cog/small.nbt diff --git a/src/main/resources/ponder/cog/speedup.nbt b/src/main/resources/assets/create/ponder/cog/speedup.nbt similarity index 100% rename from src/main/resources/ponder/cog/speedup.nbt rename to src/main/resources/assets/create/ponder/cog/speedup.nbt diff --git a/src/main/resources/ponder/creative_motor.nbt b/src/main/resources/assets/create/ponder/creative_motor.nbt similarity index 100% rename from src/main/resources/ponder/creative_motor.nbt rename to src/main/resources/assets/create/ponder/creative_motor.nbt diff --git a/src/main/resources/ponder/crushing_wheel.nbt b/src/main/resources/assets/create/ponder/crushing_wheel.nbt similarity index 100% rename from src/main/resources/ponder/crushing_wheel.nbt rename to src/main/resources/assets/create/ponder/crushing_wheel.nbt diff --git a/src/main/resources/ponder/debug/scene_1.nbt b/src/main/resources/assets/create/ponder/debug/scene_1.nbt similarity index 100% rename from src/main/resources/ponder/debug/scene_1.nbt rename to src/main/resources/assets/create/ponder/debug/scene_1.nbt diff --git a/src/main/resources/ponder/debug/scene_10.nbt b/src/main/resources/assets/create/ponder/debug/scene_10.nbt similarity index 100% rename from src/main/resources/ponder/debug/scene_10.nbt rename to src/main/resources/assets/create/ponder/debug/scene_10.nbt diff --git a/src/main/resources/ponder/debug/scene_2.nbt b/src/main/resources/assets/create/ponder/debug/scene_2.nbt similarity index 100% rename from src/main/resources/ponder/debug/scene_2.nbt rename to src/main/resources/assets/create/ponder/debug/scene_2.nbt diff --git a/src/main/resources/ponder/debug/scene_3.nbt b/src/main/resources/assets/create/ponder/debug/scene_3.nbt similarity index 100% rename from src/main/resources/ponder/debug/scene_3.nbt rename to src/main/resources/assets/create/ponder/debug/scene_3.nbt diff --git a/src/main/resources/ponder/debug/scene_4.nbt b/src/main/resources/assets/create/ponder/debug/scene_4.nbt similarity index 100% rename from src/main/resources/ponder/debug/scene_4.nbt rename to src/main/resources/assets/create/ponder/debug/scene_4.nbt diff --git a/src/main/resources/ponder/debug/scene_5.nbt b/src/main/resources/assets/create/ponder/debug/scene_5.nbt similarity index 100% rename from src/main/resources/ponder/debug/scene_5.nbt rename to src/main/resources/assets/create/ponder/debug/scene_5.nbt diff --git a/src/main/resources/ponder/debug/scene_6.nbt b/src/main/resources/assets/create/ponder/debug/scene_6.nbt similarity index 100% rename from src/main/resources/ponder/debug/scene_6.nbt rename to src/main/resources/assets/create/ponder/debug/scene_6.nbt diff --git a/src/main/resources/ponder/debug/scene_7.nbt b/src/main/resources/assets/create/ponder/debug/scene_7.nbt similarity index 100% rename from src/main/resources/ponder/debug/scene_7.nbt rename to src/main/resources/assets/create/ponder/debug/scene_7.nbt diff --git a/src/main/resources/ponder/debug/scene_8.nbt b/src/main/resources/assets/create/ponder/debug/scene_8.nbt similarity index 100% rename from src/main/resources/ponder/debug/scene_8.nbt rename to src/main/resources/assets/create/ponder/debug/scene_8.nbt diff --git a/src/main/resources/ponder/debug/scene_9.nbt b/src/main/resources/assets/create/ponder/debug/scene_9.nbt similarity index 100% rename from src/main/resources/ponder/debug/scene_9.nbt rename to src/main/resources/assets/create/ponder/debug/scene_9.nbt diff --git a/src/main/resources/ponder/deployer/contraption.nbt b/src/main/resources/assets/create/ponder/deployer/contraption.nbt similarity index 100% rename from src/main/resources/ponder/deployer/contraption.nbt rename to src/main/resources/assets/create/ponder/deployer/contraption.nbt diff --git a/src/main/resources/ponder/deployer/filter.nbt b/src/main/resources/assets/create/ponder/deployer/filter.nbt similarity index 100% rename from src/main/resources/ponder/deployer/filter.nbt rename to src/main/resources/assets/create/ponder/deployer/filter.nbt diff --git a/src/main/resources/ponder/deployer/modes.nbt b/src/main/resources/assets/create/ponder/deployer/modes.nbt similarity index 100% rename from src/main/resources/ponder/deployer/modes.nbt rename to src/main/resources/assets/create/ponder/deployer/modes.nbt diff --git a/src/main/resources/ponder/deployer/processing.nbt b/src/main/resources/assets/create/ponder/deployer/processing.nbt similarity index 100% rename from src/main/resources/ponder/deployer/processing.nbt rename to src/main/resources/assets/create/ponder/deployer/processing.nbt diff --git a/src/main/resources/ponder/deployer/redstone.nbt b/src/main/resources/assets/create/ponder/deployer/redstone.nbt similarity index 100% rename from src/main/resources/ponder/deployer/redstone.nbt rename to src/main/resources/assets/create/ponder/deployer/redstone.nbt diff --git a/src/main/resources/ponder/depot.nbt b/src/main/resources/assets/create/ponder/depot.nbt similarity index 100% rename from src/main/resources/ponder/depot.nbt rename to src/main/resources/assets/create/ponder/depot.nbt diff --git a/src/main/resources/ponder/empty_blaze_burner.nbt b/src/main/resources/assets/create/ponder/empty_blaze_burner.nbt similarity index 100% rename from src/main/resources/ponder/empty_blaze_burner.nbt rename to src/main/resources/assets/create/ponder/empty_blaze_burner.nbt diff --git a/src/main/resources/ponder/fan/direction.nbt b/src/main/resources/assets/create/ponder/fan/direction.nbt similarity index 100% rename from src/main/resources/ponder/fan/direction.nbt rename to src/main/resources/assets/create/ponder/fan/direction.nbt diff --git a/src/main/resources/ponder/fan/processing.nbt b/src/main/resources/assets/create/ponder/fan/processing.nbt similarity index 100% rename from src/main/resources/ponder/fan/processing.nbt rename to src/main/resources/assets/create/ponder/fan/processing.nbt diff --git a/src/main/resources/ponder/fan/source.nbt b/src/main/resources/assets/create/ponder/fan/source.nbt similarity index 100% rename from src/main/resources/ponder/fan/source.nbt rename to src/main/resources/assets/create/ponder/fan/source.nbt diff --git a/src/main/resources/ponder/fluid_pipe/encasing.nbt b/src/main/resources/assets/create/ponder/fluid_pipe/encasing.nbt similarity index 100% rename from src/main/resources/ponder/fluid_pipe/encasing.nbt rename to src/main/resources/assets/create/ponder/fluid_pipe/encasing.nbt diff --git a/src/main/resources/ponder/fluid_pipe/flow.nbt b/src/main/resources/assets/create/ponder/fluid_pipe/flow.nbt similarity index 100% rename from src/main/resources/ponder/fluid_pipe/flow.nbt rename to src/main/resources/assets/create/ponder/fluid_pipe/flow.nbt diff --git a/src/main/resources/ponder/fluid_pipe/interaction.nbt b/src/main/resources/assets/create/ponder/fluid_pipe/interaction.nbt similarity index 100% rename from src/main/resources/ponder/fluid_pipe/interaction.nbt rename to src/main/resources/assets/create/ponder/fluid_pipe/interaction.nbt diff --git a/src/main/resources/ponder/fluid_tank/sizes.nbt b/src/main/resources/assets/create/ponder/fluid_tank/sizes.nbt similarity index 100% rename from src/main/resources/ponder/fluid_tank/sizes.nbt rename to src/main/resources/assets/create/ponder/fluid_tank/sizes.nbt diff --git a/src/main/resources/ponder/fluid_tank/sizes_creative.nbt b/src/main/resources/assets/create/ponder/fluid_tank/sizes_creative.nbt similarity index 100% rename from src/main/resources/ponder/fluid_tank/sizes_creative.nbt rename to src/main/resources/assets/create/ponder/fluid_tank/sizes_creative.nbt diff --git a/src/main/resources/ponder/fluid_tank/storage.nbt b/src/main/resources/assets/create/ponder/fluid_tank/storage.nbt similarity index 100% rename from src/main/resources/ponder/fluid_tank/storage.nbt rename to src/main/resources/assets/create/ponder/fluid_tank/storage.nbt diff --git a/src/main/resources/ponder/fluid_tank/storage_creative.nbt b/src/main/resources/assets/create/ponder/fluid_tank/storage_creative.nbt similarity index 100% rename from src/main/resources/ponder/fluid_tank/storage_creative.nbt rename to src/main/resources/assets/create/ponder/fluid_tank/storage_creative.nbt diff --git a/src/main/resources/ponder/fluid_valve.nbt b/src/main/resources/assets/create/ponder/fluid_valve.nbt similarity index 100% rename from src/main/resources/ponder/fluid_valve.nbt rename to src/main/resources/assets/create/ponder/fluid_valve.nbt diff --git a/src/main/resources/ponder/funnels/brass.nbt b/src/main/resources/assets/create/ponder/funnels/brass.nbt similarity index 100% rename from src/main/resources/ponder/funnels/brass.nbt rename to src/main/resources/assets/create/ponder/funnels/brass.nbt diff --git a/src/main/resources/ponder/funnels/compat.nbt b/src/main/resources/assets/create/ponder/funnels/compat.nbt similarity index 100% rename from src/main/resources/ponder/funnels/compat.nbt rename to src/main/resources/assets/create/ponder/funnels/compat.nbt diff --git a/src/main/resources/ponder/funnels/direction.nbt b/src/main/resources/assets/create/ponder/funnels/direction.nbt similarity index 100% rename from src/main/resources/ponder/funnels/direction.nbt rename to src/main/resources/assets/create/ponder/funnels/direction.nbt diff --git a/src/main/resources/ponder/funnels/intro.nbt b/src/main/resources/assets/create/ponder/funnels/intro.nbt similarity index 100% rename from src/main/resources/ponder/funnels/intro.nbt rename to src/main/resources/assets/create/ponder/funnels/intro.nbt diff --git a/src/main/resources/ponder/funnels/redstone.nbt b/src/main/resources/assets/create/ponder/funnels/redstone.nbt similarity index 100% rename from src/main/resources/ponder/funnels/redstone.nbt rename to src/main/resources/assets/create/ponder/funnels/redstone.nbt diff --git a/src/main/resources/ponder/funnels/transposer.nbt b/src/main/resources/assets/create/ponder/funnels/transposer.nbt similarity index 100% rename from src/main/resources/ponder/funnels/transposer.nbt rename to src/main/resources/assets/create/ponder/funnels/transposer.nbt diff --git a/src/main/resources/ponder/furnace_engine.nbt b/src/main/resources/assets/create/ponder/furnace_engine.nbt similarity index 100% rename from src/main/resources/ponder/furnace_engine.nbt rename to src/main/resources/assets/create/ponder/furnace_engine.nbt diff --git a/src/main/resources/ponder/gantry/direction.nbt b/src/main/resources/assets/create/ponder/gantry/direction.nbt similarity index 100% rename from src/main/resources/ponder/gantry/direction.nbt rename to src/main/resources/assets/create/ponder/gantry/direction.nbt diff --git a/src/main/resources/ponder/gantry/intro.nbt b/src/main/resources/assets/create/ponder/gantry/intro.nbt similarity index 100% rename from src/main/resources/ponder/gantry/intro.nbt rename to src/main/resources/assets/create/ponder/gantry/intro.nbt diff --git a/src/main/resources/ponder/gantry/redstone.nbt b/src/main/resources/assets/create/ponder/gantry/redstone.nbt similarity index 100% rename from src/main/resources/ponder/gantry/redstone.nbt rename to src/main/resources/assets/create/ponder/gantry/redstone.nbt diff --git a/src/main/resources/ponder/gantry/subgantry.nbt b/src/main/resources/assets/create/ponder/gantry/subgantry.nbt similarity index 100% rename from src/main/resources/ponder/gantry/subgantry.nbt rename to src/main/resources/assets/create/ponder/gantry/subgantry.nbt diff --git a/src/main/resources/ponder/gauges.nbt b/src/main/resources/assets/create/ponder/gauges.nbt similarity index 100% rename from src/main/resources/ponder/gauges.nbt rename to src/main/resources/assets/create/ponder/gauges.nbt diff --git a/src/main/resources/ponder/gearbox.nbt b/src/main/resources/assets/create/ponder/gearbox.nbt similarity index 100% rename from src/main/resources/ponder/gearbox.nbt rename to src/main/resources/assets/create/ponder/gearbox.nbt diff --git a/src/main/resources/ponder/gearshift.nbt b/src/main/resources/assets/create/ponder/gearshift.nbt similarity index 100% rename from src/main/resources/ponder/gearshift.nbt rename to src/main/resources/assets/create/ponder/gearshift.nbt diff --git a/src/main/resources/ponder/hand_crank.nbt b/src/main/resources/assets/create/ponder/hand_crank.nbt similarity index 100% rename from src/main/resources/ponder/hand_crank.nbt rename to src/main/resources/assets/create/ponder/hand_crank.nbt diff --git a/src/main/resources/ponder/harvester.nbt b/src/main/resources/assets/create/ponder/harvester.nbt similarity index 100% rename from src/main/resources/ponder/harvester.nbt rename to src/main/resources/assets/create/ponder/harvester.nbt diff --git a/src/main/resources/ponder/hose_pulley/infinite.nbt b/src/main/resources/assets/create/ponder/hose_pulley/infinite.nbt similarity index 100% rename from src/main/resources/ponder/hose_pulley/infinite.nbt rename to src/main/resources/assets/create/ponder/hose_pulley/infinite.nbt diff --git a/src/main/resources/ponder/hose_pulley/intro.nbt b/src/main/resources/assets/create/ponder/hose_pulley/intro.nbt similarity index 100% rename from src/main/resources/ponder/hose_pulley/intro.nbt rename to src/main/resources/assets/create/ponder/hose_pulley/intro.nbt diff --git a/src/main/resources/ponder/hose_pulley/level.nbt b/src/main/resources/assets/create/ponder/hose_pulley/level.nbt similarity index 100% rename from src/main/resources/ponder/hose_pulley/level.nbt rename to src/main/resources/assets/create/ponder/hose_pulley/level.nbt diff --git a/src/main/resources/ponder/item_drain.nbt b/src/main/resources/assets/create/ponder/item_drain.nbt similarity index 100% rename from src/main/resources/ponder/item_drain.nbt rename to src/main/resources/assets/create/ponder/item_drain.nbt diff --git a/src/main/resources/ponder/mechanical_arm/filter.nbt b/src/main/resources/assets/create/ponder/mechanical_arm/filter.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_arm/filter.nbt rename to src/main/resources/assets/create/ponder/mechanical_arm/filter.nbt diff --git a/src/main/resources/ponder/mechanical_arm/modes.nbt b/src/main/resources/assets/create/ponder/mechanical_arm/modes.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_arm/modes.nbt rename to src/main/resources/assets/create/ponder/mechanical_arm/modes.nbt diff --git a/src/main/resources/ponder/mechanical_arm/redstone.nbt b/src/main/resources/assets/create/ponder/mechanical_arm/redstone.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_arm/redstone.nbt rename to src/main/resources/assets/create/ponder/mechanical_arm/redstone.nbt diff --git a/src/main/resources/ponder/mechanical_arm/setup.nbt b/src/main/resources/assets/create/ponder/mechanical_arm/setup.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_arm/setup.nbt rename to src/main/resources/assets/create/ponder/mechanical_arm/setup.nbt diff --git a/src/main/resources/ponder/mechanical_bearing/anchor.nbt b/src/main/resources/assets/create/ponder/mechanical_bearing/anchor.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_bearing/anchor.nbt rename to src/main/resources/assets/create/ponder/mechanical_bearing/anchor.nbt diff --git a/src/main/resources/ponder/mechanical_bearing/modes.nbt b/src/main/resources/assets/create/ponder/mechanical_bearing/modes.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_bearing/modes.nbt rename to src/main/resources/assets/create/ponder/mechanical_bearing/modes.nbt diff --git a/src/main/resources/ponder/mechanical_bearing/stabilized.nbt b/src/main/resources/assets/create/ponder/mechanical_bearing/stabilized.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_bearing/stabilized.nbt rename to src/main/resources/assets/create/ponder/mechanical_bearing/stabilized.nbt diff --git a/src/main/resources/ponder/mechanical_crafter/connect.nbt b/src/main/resources/assets/create/ponder/mechanical_crafter/connect.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_crafter/connect.nbt rename to src/main/resources/assets/create/ponder/mechanical_crafter/connect.nbt diff --git a/src/main/resources/ponder/mechanical_crafter/covers.nbt b/src/main/resources/assets/create/ponder/mechanical_crafter/covers.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_crafter/covers.nbt rename to src/main/resources/assets/create/ponder/mechanical_crafter/covers.nbt diff --git a/src/main/resources/ponder/mechanical_crafter/setup.nbt b/src/main/resources/assets/create/ponder/mechanical_crafter/setup.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_crafter/setup.nbt rename to src/main/resources/assets/create/ponder/mechanical_crafter/setup.nbt diff --git a/src/main/resources/ponder/mechanical_drill/breaker.nbt b/src/main/resources/assets/create/ponder/mechanical_drill/breaker.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_drill/breaker.nbt rename to src/main/resources/assets/create/ponder/mechanical_drill/breaker.nbt diff --git a/src/main/resources/ponder/mechanical_drill/contraption.nbt b/src/main/resources/assets/create/ponder/mechanical_drill/contraption.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_drill/contraption.nbt rename to src/main/resources/assets/create/ponder/mechanical_drill/contraption.nbt diff --git a/src/main/resources/ponder/mechanical_mixer/mixing.nbt b/src/main/resources/assets/create/ponder/mechanical_mixer/mixing.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_mixer/mixing.nbt rename to src/main/resources/assets/create/ponder/mechanical_mixer/mixing.nbt diff --git a/src/main/resources/ponder/mechanical_piston/anchor.nbt b/src/main/resources/assets/create/ponder/mechanical_piston/anchor.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_piston/anchor.nbt rename to src/main/resources/assets/create/ponder/mechanical_piston/anchor.nbt diff --git a/src/main/resources/ponder/mechanical_piston/modes.nbt b/src/main/resources/assets/create/ponder/mechanical_piston/modes.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_piston/modes.nbt rename to src/main/resources/assets/create/ponder/mechanical_piston/modes.nbt diff --git a/src/main/resources/ponder/mechanical_piston/piston_pole.nbt b/src/main/resources/assets/create/ponder/mechanical_piston/piston_pole.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_piston/piston_pole.nbt rename to src/main/resources/assets/create/ponder/mechanical_piston/piston_pole.nbt diff --git a/src/main/resources/ponder/mechanical_press/compacting.nbt b/src/main/resources/assets/create/ponder/mechanical_press/compacting.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_press/compacting.nbt rename to src/main/resources/assets/create/ponder/mechanical_press/compacting.nbt diff --git a/src/main/resources/ponder/mechanical_press/pressing.nbt b/src/main/resources/assets/create/ponder/mechanical_press/pressing.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_press/pressing.nbt rename to src/main/resources/assets/create/ponder/mechanical_press/pressing.nbt diff --git a/src/main/resources/ponder/mechanical_pump/flow.nbt b/src/main/resources/assets/create/ponder/mechanical_pump/flow.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_pump/flow.nbt rename to src/main/resources/assets/create/ponder/mechanical_pump/flow.nbt diff --git a/src/main/resources/ponder/mechanical_pump/speed.nbt b/src/main/resources/assets/create/ponder/mechanical_pump/speed.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_pump/speed.nbt rename to src/main/resources/assets/create/ponder/mechanical_pump/speed.nbt diff --git a/src/main/resources/ponder/mechanical_saw/breaker.nbt b/src/main/resources/assets/create/ponder/mechanical_saw/breaker.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_saw/breaker.nbt rename to src/main/resources/assets/create/ponder/mechanical_saw/breaker.nbt diff --git a/src/main/resources/ponder/mechanical_saw/contraption.nbt b/src/main/resources/assets/create/ponder/mechanical_saw/contraption.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_saw/contraption.nbt rename to src/main/resources/assets/create/ponder/mechanical_saw/contraption.nbt diff --git a/src/main/resources/ponder/mechanical_saw/processing.nbt b/src/main/resources/assets/create/ponder/mechanical_saw/processing.nbt similarity index 100% rename from src/main/resources/ponder/mechanical_saw/processing.nbt rename to src/main/resources/assets/create/ponder/mechanical_saw/processing.nbt diff --git a/src/main/resources/ponder/millstone.nbt b/src/main/resources/assets/create/ponder/millstone.nbt similarity index 100% rename from src/main/resources/ponder/millstone.nbt rename to src/main/resources/assets/create/ponder/millstone.nbt diff --git a/src/main/resources/ponder/nixie_tube.nbt b/src/main/resources/assets/create/ponder/nixie_tube.nbt similarity index 100% rename from src/main/resources/ponder/nixie_tube.nbt rename to src/main/resources/assets/create/ponder/nixie_tube.nbt diff --git a/src/main/resources/ponder/plough.nbt b/src/main/resources/assets/create/ponder/plough.nbt similarity index 100% rename from src/main/resources/ponder/plough.nbt rename to src/main/resources/assets/create/ponder/plough.nbt diff --git a/src/main/resources/ponder/portable_interface/redstone.nbt b/src/main/resources/assets/create/ponder/portable_interface/redstone.nbt similarity index 100% rename from src/main/resources/ponder/portable_interface/redstone.nbt rename to src/main/resources/assets/create/ponder/portable_interface/redstone.nbt diff --git a/src/main/resources/ponder/portable_interface/redstone_fluid.nbt b/src/main/resources/assets/create/ponder/portable_interface/redstone_fluid.nbt similarity index 100% rename from src/main/resources/ponder/portable_interface/redstone_fluid.nbt rename to src/main/resources/assets/create/ponder/portable_interface/redstone_fluid.nbt diff --git a/src/main/resources/ponder/portable_interface/transfer.nbt b/src/main/resources/assets/create/ponder/portable_interface/transfer.nbt similarity index 100% rename from src/main/resources/ponder/portable_interface/transfer.nbt rename to src/main/resources/assets/create/ponder/portable_interface/transfer.nbt diff --git a/src/main/resources/ponder/portable_interface/transfer_fluid.nbt b/src/main/resources/assets/create/ponder/portable_interface/transfer_fluid.nbt similarity index 100% rename from src/main/resources/ponder/portable_interface/transfer_fluid.nbt rename to src/main/resources/assets/create/ponder/portable_interface/transfer_fluid.nbt diff --git a/src/main/resources/ponder/powered_latch.nbt b/src/main/resources/assets/create/ponder/powered_latch.nbt similarity index 100% rename from src/main/resources/ponder/powered_latch.nbt rename to src/main/resources/assets/create/ponder/powered_latch.nbt diff --git a/src/main/resources/ponder/powered_toggle_latch.nbt b/src/main/resources/assets/create/ponder/powered_toggle_latch.nbt similarity index 100% rename from src/main/resources/ponder/powered_toggle_latch.nbt rename to src/main/resources/assets/create/ponder/powered_toggle_latch.nbt diff --git a/src/main/resources/ponder/pulse_repeater.nbt b/src/main/resources/assets/create/ponder/pulse_repeater.nbt similarity index 100% rename from src/main/resources/ponder/pulse_repeater.nbt rename to src/main/resources/assets/create/ponder/pulse_repeater.nbt diff --git a/src/main/resources/ponder/redstone_contact.nbt b/src/main/resources/assets/create/ponder/redstone_contact.nbt similarity index 100% rename from src/main/resources/ponder/redstone_contact.nbt rename to src/main/resources/assets/create/ponder/redstone_contact.nbt diff --git a/src/main/resources/ponder/redstone_link.nbt b/src/main/resources/assets/create/ponder/redstone_link.nbt similarity index 100% rename from src/main/resources/ponder/redstone_link.nbt rename to src/main/resources/assets/create/ponder/redstone_link.nbt diff --git a/src/main/resources/ponder/rope_pulley/anchor.nbt b/src/main/resources/assets/create/ponder/rope_pulley/anchor.nbt similarity index 100% rename from src/main/resources/ponder/rope_pulley/anchor.nbt rename to src/main/resources/assets/create/ponder/rope_pulley/anchor.nbt diff --git a/src/main/resources/ponder/rope_pulley/attachment.nbt b/src/main/resources/assets/create/ponder/rope_pulley/attachment.nbt similarity index 100% rename from src/main/resources/ponder/rope_pulley/attachment.nbt rename to src/main/resources/assets/create/ponder/rope_pulley/attachment.nbt diff --git a/src/main/resources/ponder/rope_pulley/modes.nbt b/src/main/resources/assets/create/ponder/rope_pulley/modes.nbt similarity index 100% rename from src/main/resources/ponder/rope_pulley/modes.nbt rename to src/main/resources/assets/create/ponder/rope_pulley/modes.nbt diff --git a/src/main/resources/ponder/sail.nbt b/src/main/resources/assets/create/ponder/sail.nbt similarity index 100% rename from src/main/resources/ponder/sail.nbt rename to src/main/resources/assets/create/ponder/sail.nbt diff --git a/src/main/resources/ponder/sequenced_gearshift.nbt b/src/main/resources/assets/create/ponder/sequenced_gearshift.nbt similarity index 100% rename from src/main/resources/ponder/sequenced_gearshift.nbt rename to src/main/resources/assets/create/ponder/sequenced_gearshift.nbt diff --git a/src/main/resources/ponder/shaft/encasing.nbt b/src/main/resources/assets/create/ponder/shaft/encasing.nbt similarity index 100% rename from src/main/resources/ponder/shaft/encasing.nbt rename to src/main/resources/assets/create/ponder/shaft/encasing.nbt diff --git a/src/main/resources/ponder/shaft/relay.nbt b/src/main/resources/assets/create/ponder/shaft/relay.nbt similarity index 100% rename from src/main/resources/ponder/shaft/relay.nbt rename to src/main/resources/assets/create/ponder/shaft/relay.nbt diff --git a/src/main/resources/ponder/smart_pipe.nbt b/src/main/resources/assets/create/ponder/smart_pipe.nbt similarity index 100% rename from src/main/resources/ponder/smart_pipe.nbt rename to src/main/resources/assets/create/ponder/smart_pipe.nbt diff --git a/src/main/resources/ponder/speed_controller.nbt b/src/main/resources/assets/create/ponder/speed_controller.nbt similarity index 100% rename from src/main/resources/ponder/speed_controller.nbt rename to src/main/resources/assets/create/ponder/speed_controller.nbt diff --git a/src/main/resources/ponder/spout.nbt b/src/main/resources/assets/create/ponder/spout.nbt similarity index 100% rename from src/main/resources/ponder/spout.nbt rename to src/main/resources/assets/create/ponder/spout.nbt diff --git a/src/main/resources/ponder/sticker.nbt b/src/main/resources/assets/create/ponder/sticker.nbt similarity index 100% rename from src/main/resources/ponder/sticker.nbt rename to src/main/resources/assets/create/ponder/sticker.nbt diff --git a/src/main/resources/ponder/super_glue.nbt b/src/main/resources/assets/create/ponder/super_glue.nbt similarity index 100% rename from src/main/resources/ponder/super_glue.nbt rename to src/main/resources/assets/create/ponder/super_glue.nbt diff --git a/src/main/resources/ponder/tunnels/andesite.nbt b/src/main/resources/assets/create/ponder/tunnels/andesite.nbt similarity index 100% rename from src/main/resources/ponder/tunnels/andesite.nbt rename to src/main/resources/assets/create/ponder/tunnels/andesite.nbt diff --git a/src/main/resources/ponder/tunnels/brass.nbt b/src/main/resources/assets/create/ponder/tunnels/brass.nbt similarity index 100% rename from src/main/resources/ponder/tunnels/brass.nbt rename to src/main/resources/assets/create/ponder/tunnels/brass.nbt diff --git a/src/main/resources/ponder/tunnels/brass_modes.nbt b/src/main/resources/assets/create/ponder/tunnels/brass_modes.nbt similarity index 100% rename from src/main/resources/ponder/tunnels/brass_modes.nbt rename to src/main/resources/assets/create/ponder/tunnels/brass_modes.nbt diff --git a/src/main/resources/ponder/valve_handle.nbt b/src/main/resources/assets/create/ponder/valve_handle.nbt similarity index 100% rename from src/main/resources/ponder/valve_handle.nbt rename to src/main/resources/assets/create/ponder/valve_handle.nbt diff --git a/src/main/resources/ponder/water_wheel.nbt b/src/main/resources/assets/create/ponder/water_wheel.nbt similarity index 100% rename from src/main/resources/ponder/water_wheel.nbt rename to src/main/resources/assets/create/ponder/water_wheel.nbt diff --git a/src/main/resources/ponder/weighted_ejector/eject.nbt b/src/main/resources/assets/create/ponder/weighted_ejector/eject.nbt similarity index 100% rename from src/main/resources/ponder/weighted_ejector/eject.nbt rename to src/main/resources/assets/create/ponder/weighted_ejector/eject.nbt diff --git a/src/main/resources/ponder/weighted_ejector/redstone.nbt b/src/main/resources/assets/create/ponder/weighted_ejector/redstone.nbt similarity index 100% rename from src/main/resources/ponder/weighted_ejector/redstone.nbt rename to src/main/resources/assets/create/ponder/weighted_ejector/redstone.nbt diff --git a/src/main/resources/ponder/weighted_ejector/split.nbt b/src/main/resources/assets/create/ponder/weighted_ejector/split.nbt similarity index 100% rename from src/main/resources/ponder/weighted_ejector/split.nbt rename to src/main/resources/assets/create/ponder/weighted_ejector/split.nbt diff --git a/src/main/resources/ponder/windmill_bearing/source.nbt b/src/main/resources/assets/create/ponder/windmill_bearing/source.nbt similarity index 100% rename from src/main/resources/ponder/windmill_bearing/source.nbt rename to src/main/resources/assets/create/ponder/windmill_bearing/source.nbt diff --git a/src/main/resources/ponder/windmill_bearing/structure.nbt b/src/main/resources/assets/create/ponder/windmill_bearing/structure.nbt similarity index 100% rename from src/main/resources/ponder/windmill_bearing/structure.nbt rename to src/main/resources/assets/create/ponder/windmill_bearing/structure.nbt