Some Xblxa xa changes; Android station idle model fix; Tritanium ingot block texture; Tritanium trapdoor texture (Dbot do the thing)
This commit is contained in:
parent
5c1d32c9c5
commit
987d6df934
@ -81,7 +81,7 @@ fun addAdvancements(serializer: Consumer<Advancement>, existingFileHelper: Exist
|
||||
.display(
|
||||
itemStack = ItemStack(MItems.ENERGY_SWORD),
|
||||
title = TranslatableComponent(translation.add("energy_sword", "Self Sharpening Blade")),
|
||||
description = TranslatableComponent(translation.add("energy_sword.desc", "Wield an Energy Sword, a melee weapon intended to slice Creepers into creep-cakes. Rational folks won't attempt to slice their Android fellows...")),
|
||||
description = TranslatableComponent(translation.add("energy_sword.desc", "Wield a High-Frequency Blade, a melee weapon intended to slice Creepers into creep-cakes. Rational folks won't attempt to slice their Android fellows...")),
|
||||
frameType = FrameType.GOAL
|
||||
)
|
||||
.addCriterion("has_item", criterion(MItems.ENERGY_SWORD))
|
||||
@ -203,7 +203,7 @@ fun addAdvancements(serializer: Consumer<Advancement>, existingFileHelper: Exist
|
||||
.display(
|
||||
itemStack = ItemStack(MItems.TRITANIUM_PLATE),
|
||||
title = TranslatableComponent(translation.add("plate", "Hard Plating")),
|
||||
description = TranslatableComponent(translation.add("plate.desc", "Roll down some Tritanium using Plate Press"))
|
||||
description = TranslatableComponent(translation.add("plate.desc", "Roll down some Tritanium using a Plate Press"))
|
||||
)
|
||||
.addCriterion("has_item", criterion(MItemTags.TRITANIUM_PLATES))
|
||||
.save(serializer, modLocation("regular/plate"), existingFileHelper)
|
||||
|
||||
@ -23,7 +23,7 @@ fun addMachineAdvancements(serializer: Consumer<Advancement>, existingFileHelper
|
||||
.display(
|
||||
itemStack = ItemStack(MItems.CHEMICAL_GENERATOR),
|
||||
title = TranslatableComponent(translation.add("root", "Tritanium Empowered Machinery")),
|
||||
description = TranslatableComponent(translation.add("root.desc", "Do not drop on anything if you want the latter preserved intact")),
|
||||
description = TranslatableComponent(translation.add("root.desc", "Do not drop in anything if you want the latter preserved intact")),
|
||||
showToast = false,
|
||||
announceChat = false,
|
||||
background = modLocation("textures/block/decorative/floor_tiles_gray.png")
|
||||
@ -56,15 +56,15 @@ fun addMachineAdvancements(serializer: Consumer<Advancement>, existingFileHelper
|
||||
val entries = listOf(
|
||||
CraftEntry(MItems.MATTER_SCANNER, "Scanning Things that Matter"),
|
||||
CraftEntry(MItems.PATTERN_STORAGE, "Digital Knowledge Library"),
|
||||
CraftEntry(MItems.MATTER_DECOMPOSER, "Decaying the Atoms", "Keep limbs outside of working chamber at all times"),
|
||||
CraftEntry(MItems.MATTER_DECOMPOSER, "Decaying the Atoms", "Keep your limbs outside of the working chamber at all times"),
|
||||
CraftEntry(MItems.MATTER_PANEL, "Indexing the Library"),
|
||||
CraftEntry(MItems.MATTER_REPLICATOR, "Local Bakery", "Now let's bake perfect bread"),
|
||||
CraftEntry(MItems.MATTER_BOTTLER, "Transfusing Pure Matter", "For those who loved to play with water in childhood"),
|
||||
CraftEntry(MItems.MATTER_REPLICATOR, "Local Bakery", "Now let's bake some perfect bread"),
|
||||
CraftEntry(MItems.MATTER_BOTTLER, "Transfusing Pure Matter", "For those who loved to play with water in their childhood"),
|
||||
CraftEntry(MItems.MATTER_RECYCLER, "Refine and Redefine", "This is what waste recycling should look like"),
|
||||
CraftEntry(MItems.MATTER_CAPACITOR_BANK, "Modular Matter Tank"),
|
||||
|
||||
CraftEntry(MItems.ENERGY_COUNTER, "Visualize Power Burn"),
|
||||
CraftEntry(MItems.BATTERY_BANK, "Batteries Not Included", "By all means avoid urge to hammer incompatible batteries onto power bus."),
|
||||
CraftEntry(MItems.BATTERY_BANK, "Batteries Not Included", "By all means avoid the urge to hammer incompatible batteries into the power bus."),
|
||||
)
|
||||
|
||||
val built = mutableMapOf<Item, Advancement>()
|
||||
|
||||
@ -27,6 +27,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
|
||||
provider.ore(MBlocks.DEEPSLATE_TRITANIUM_ORE)
|
||||
provider.ore(MBlocks.TRITANIUM_ORE)
|
||||
provider.ore(MBlocks.TRITANIUM_RAW_BLOCK)
|
||||
provider.block(MBlocks.TRITANIUM_INGOT_BLOCK)
|
||||
|
||||
provider.block(MBlocks.CHEMICAL_GENERATOR)
|
||||
provider.block(MBlocks.MATTER_SCANNER)
|
||||
|
||||
@ -25,6 +25,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
|
||||
provider.block(MItems.TRITANIUM_ORE)
|
||||
provider.block(MItems.TRITANIUM_STRIPED_BLOCK)
|
||||
provider.block(MItems.TRITANIUM_RAW_BLOCK)
|
||||
provider.block(MItems.TRITANIUM_INGOT_BLOCK)
|
||||
provider.block(MItems.ITEM_MONITOR)
|
||||
provider.block(MItems.PHANTOM_ATTRACTOR)
|
||||
|
||||
|
||||
@ -86,13 +86,13 @@ private fun misc(provider: MatteryLanguageProvider) {
|
||||
gui("exosuit.probe2", "There is fingerprint reader built into one of sides which gently glow when touched.")
|
||||
gui("exosuit.probe3", "It seems this box will unlock once you strongly press fingerprint reader, and you feel what's inside will affect you without any way back!")
|
||||
|
||||
gui("exosuit.already_activated", "You already have Exosuit following you")
|
||||
gui("exosuit.already_activated", "You already have an Exosuit following you")
|
||||
|
||||
gui("exosuit_upgrades.no_exosuit", "This piece of technology seems to be of no use to you.... Or is it?!")
|
||||
gui("exosuit_upgrades.no_exosuit", "This piece of technology seems to be of no use to you.... Or does it?!")
|
||||
|
||||
gui("exosuit_upgrades.already_activated", "Upgrade is already active!")
|
||||
gui("exosuit_upgrades.slots_upgrade", "Using this will permanently grant %s slots in Exosuit inventory.")
|
||||
gui("exosuit_upgrades.crafting_upgrade", "Using this will permanently grant 3x3 crafting grid in Exosuit inventory.")
|
||||
gui("exosuit_upgrades.slots_upgrade", "Using this will permanently grant %s slots in your Exosuit inventory.")
|
||||
gui("exosuit_upgrades.crafting_upgrade", "Using this will permanently grant 3x3 crafting grid in your Exosuit inventory.")
|
||||
|
||||
gui("crude_battery.replace_in_world", "Simplistic nature of this battery allows to replace your energy source in the field without using Android Station.")
|
||||
gui("crude_battery.replace_in_world_warning", "This operation is very unstable and causes serious damage to your systems!")
|
||||
@ -104,9 +104,9 @@ private fun misc(provider: MatteryLanguageProvider) {
|
||||
misc("exosuit_upgrades.slots_upgraded", "Your Exosuit has permanently gained %s slots")
|
||||
misc("exosuit_upgrades.crafting_upgraded", "Your Exosuit has permanently gained 3x3 crafting grid")
|
||||
|
||||
misc("exosuit.granted1", "As you keep pressing fingerprint reader, you are getting hurt in finger.")
|
||||
misc("exosuit.granted1", "As you keep pressing on the fingerprint reader, you are getting hurt in finger.")
|
||||
misc("exosuit.granted2", "After you raise your finger, fingerprint reader glows very bright.")
|
||||
misc("exosuit.granted3", "Then, fingerprint reader fades, leaving faint trace not of your finger, but of your very soul.")
|
||||
misc("exosuit.granted3", "Then, the fingerprint reader fades, leaving faint trace not of your finger, but of your very soul.")
|
||||
misc("exosuit.granted4", "The device opens... And whatever was inside it shroud you, yet you feel nothing, as it wasn't even there.")
|
||||
misc("exosuit.granted5", "As whatever shrouded you takes final form, you feel it binds to your soul.")
|
||||
misc("exosuit.granted6", "INITIALIZATION SEQUENCE COMPLETE. WELCOME, USER %s")
|
||||
@ -288,13 +288,13 @@ private fun death(provider: MatteryLanguageProvider) {
|
||||
with(provider.english) {
|
||||
death("otm_become_android", "%1\$s lost their humanity")
|
||||
death("otm_become_humane", "%1\$s regained their humanity")
|
||||
death("otm_event_horizon", "%1\$s never crossed event horizon")
|
||||
death("otm_event_horizon", "%1\$s never crossed the event horizon")
|
||||
death("otm_hawking_radiation", "%1\$s discovered Hawking radiation")
|
||||
death("otm_emp", "%1\$s electronics' fried")
|
||||
|
||||
death("otm_become_android.player", "%1\$s lost their humanity whilst %2\$s tried to reason with them")
|
||||
death("otm_become_humane.player", "%1\$s gained their humanity whilst %2\$s tried to reason with them")
|
||||
death("otm_event_horizon.player", "%1\$s tried to cross event horizon whilst trying to escape %2\$s")
|
||||
death("otm_event_horizon.player", "%1\$s tried to cross the event horizon whilst trying to escape %2\$s")
|
||||
death("otm_hawking_radiation.player", "%1\$s disintegrated whilst fighting %2\$s")
|
||||
death("otm_emp.player", "%1\$s blew fuzes of %2\$s")
|
||||
death("otm_emp.player.item", "%1\$s blew fuzes of %2\$s using %3\$s")
|
||||
@ -465,7 +465,7 @@ private fun items(provider: MatteryLanguageProvider) {
|
||||
add(MItems.MATTER_CAPACITOR_DENSE, "Dense Matter Capacitor")
|
||||
add(MItems.MATTER_CAPACITOR_CREATIVE, "Creative Matter Capacitor")
|
||||
|
||||
add(MItems.ENERGY_SWORD, "Powered Cake Slicer")
|
||||
add(MItems.ENERGY_SWORD, "High-Frequency Blade")
|
||||
add(MItems.ENERGY_SWORD, "desc", "Needs power to operate")
|
||||
add(MItems.ENERGY_SWORD, "desc2", "Deals extra damage to androids when empowered")
|
||||
add(MItems.ENERGY_SWORD, "desc3", "Always strikes surrounding enemies with full damage if empowered")
|
||||
@ -473,7 +473,7 @@ private fun items(provider: MatteryLanguageProvider) {
|
||||
|
||||
add(MItems.PORTABLE_CONDENSATION_DRIVE, "Portable Condensation Drive")
|
||||
add(MItems.PORTABLE_DENSE_CONDENSATION_DRIVE, "Portable Dense Condensation Drive")
|
||||
add(MItems.PLASMA_RIFLE, "Plasma Rifle")
|
||||
add(MItems.PLASMA_RIFLE, "Plasma Repeater")
|
||||
add(MItems.TRITANIUM_ORE_CLUMP, "Raw Tritanium")
|
||||
add(MItems.PATTERN_DRIVE_NORMAL, "Pattern Drive")
|
||||
add(MItems.PATTERN_DRIVE_CREATIVE, "Creative Pattern Drive")
|
||||
|
||||
@ -8,6 +8,7 @@ fun addBlockModels(provider: MatteryBlockModelProvider) {
|
||||
resourceCubeAll(MBlocks.TRITANIUM_ORE)
|
||||
resourceCubeAll(MBlocks.TRITANIUM_RAW_BLOCK)
|
||||
resourceCubeAll(MBlocks.DEEPSLATE_TRITANIUM_ORE)
|
||||
resourceCubeAll(MBlocks.TRITANIUM_INGOT_BLOCK)
|
||||
|
||||
exec {
|
||||
copy("block/battery/battery1", "block/battery/battery0").also { it.offset(-4f, 0f, 0f) }
|
||||
|
||||
@ -96,18 +96,6 @@
|
||||
"up": {"uv": [0, 0, 1, 0.58182], "texture": "#0"},
|
||||
"down": {"uv": [0, 0, 1, 0.58182], "texture": "#0"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [-1, 10, -1],
|
||||
"to": [17, 10, 17],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 8, 0], "texture": "#missing"},
|
||||
"east": {"uv": [0, 0, 8, 0], "texture": "#missing"},
|
||||
"south": {"uv": [0, 0, 8, 0], "texture": "#missing"},
|
||||
"west": {"uv": [0, 0, 8, 0], "texture": "#missing"},
|
||||
"up": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"},
|
||||
"down": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 540 B |
Binary file not shown.
|
After Width: | Height: | Size: 417 B |
Loading…
Reference in New Issue
Block a user